craftinc/craftinc-gates
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added parameter checks and final attributes to the FloodUtil class.

Browse Source
This commit is contained in:
Tobias Ottenweller
2013-06-19 13:42:16 +02:00
parent 99be2905be
commit ecd219fb2d
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/de/craftinc/gates/util/FloodUtil.java
View File

@@ -52,7 +52,7 @@ public class FloodUtil
* @param blocks All blocks inside the gate. * @param blocks All blocks inside the gate.
* @return A Set containing all frame block. Will never return 'null'. * @return A Set containing all frame block. Will never return 'null'.
*/ */
public static Set<Block> getFrame(Set<Block> blocks) public static Set<Block> getFrame(final Set<Block> blocks)
{ {
if (blocks == null || blocks.isEmpty()) { if (blocks == null || blocks.isEmpty()) {
return new HashSet<Block>(); return new HashSet<Block>();
@@ -101,7 +101,7 @@ public class FloodUtil
protected static Set<Block> _getFrame(Set<Block> blocks, Set<BlockFace> searchDirections) protected static Set<Block> _getFrame(final Set<Block> blocks, final Set<BlockFace> searchDirections)
{ {
Set<Block> frameBlocks = new HashSet<Block>(); Set<Block> frameBlocks = new HashSet<Block>();
@@ -125,8 +125,12 @@ public class FloodUtil
* @param locations All locations inside the gate. * @param locations All locations inside the gate.
* @return A Set containing all frame block. Will never return 'null'. * @return A Set containing all frame block. Will never return 'null'.
*/ */
public static Set<Block> getFrameWithLocations(Set<Location> locations) public static Set<Block> getFrameWithLocations(final Set<Location> locations)
{ {
if (locations == null) {
throw new IllegalArgumentException("'locations' must not be 'null'");
}
Set<Block> blocks = new HashSet<Block>(); Set<Block> blocks = new HashSet<Block>();
for (Location l : locations) { for (Location l : locations) {
@@ -138,9 +142,13 @@ public class FloodUtil
// For the same frame and location this set of blocks is deterministic // For the same frame and location this set of blocks is deterministic
public static Set<Block> getGatePortalBlocks(Block block) public static Set<Block> getGatePortalBlocks(final Block block)
{ {
int frameBlockSearchLimit = Plugin.getPlugin().getConfig().getInt(Plugin.confMaxGateBlocksKey); if (block == null) {
throw new IllegalArgumentException("'block' must not be 'null'");
}
int frameBlockSearchLimit = Plugin.getPlugin().getConfig().getInt(Plugin.confMaxGateBlocksKey);
Set<Block> blocks1 = getAirFloodBlocks(block, new HashSet<Block>(), exp1, frameBlockSearchLimit); Set<Block> blocks1 = getAirFloodBlocks(block, new HashSet<Block>(), exp1, frameBlockSearchLimit);
Set<Block> blocks2 = getAirFloodBlocks(block, new HashSet<Block>(), exp2, frameBlockSearchLimit); Set<Block> blocks2 = getAirFloodBlocks(block, new HashSet<Block>(), exp2, frameBlockSearchLimit);
@@ -165,7 +173,10 @@ public class FloodUtil
} }
protected static Set<Block> getAirFloodBlocks(Block startBlock, Set<Block> foundBlocks, Set<BlockFace> expandFaces, int limit) protected static Set<Block> getAirFloodBlocks(final Block startBlock,
Set<Block> foundBlocks,
final Set<BlockFace> expandFaces,
int limit)
{ {
if (foundBlocks == null) { if (foundBlocks == null) {
return null; return null;