feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Fixed param area without a specified radius throwing an exception

Browse Source
This commit is contained in:
Robin Kupper
2011-11-20 15:38:48 +01:00
parent b7fd2579d4
commit 2c181fb3d8
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/de/diddiz/LogBlock/QueryParams.java
View File

@@ -286,7 +286,7 @@ public class QueryParams implements Cloneable
throw new IllegalArgumentException("This is your first command, you can't use last."); throw new IllegalArgumentException("This is your first command, you can't use last.");
merge(session.lastQuery); merge(session.lastQuery);
} else if (param.equals("player")) { } else if (param.equals("player")) {
if (values == null || values.length < 1) if (values.length < 1)
throw new IllegalArgumentException("No or wrong count of arguments for '" + param + "'"); throw new IllegalArgumentException("No or wrong count of arguments for '" + param + "'");
for (final String playerName : values) for (final String playerName : values)
if (playerName.length() > 0) { if (playerName.length() > 0) {
@@ -302,7 +302,7 @@ public class QueryParams implements Cloneable
} }
} }
} else if (param.equals("block") || param.equals("type")) { } else if (param.equals("block") || param.equals("type")) {
if (values == null || values.length < 1) if (values.length < 1)
throw new IllegalArgumentException("No or wrong count of arguments for '" + param + "'"); throw new IllegalArgumentException("No or wrong count of arguments for '" + param + "'");
for (final String blockName : values) { for (final String blockName : values) {
final Material mat = Material.matchMaterial(blockName); final Material mat = Material.matchMaterial(blockName);
@@ -313,7 +313,7 @@ public class QueryParams implements Cloneable
} else if (param.equals("area")) { } else if (param.equals("area")) {
if (player == null && !prepareToolQuery) if (player == null && !prepareToolQuery)
throw new IllegalArgumentException("You have to ba a player to use area"); throw new IllegalArgumentException("You have to ba a player to use area");
if (values == null) { if (values.length == 0) {
radius = logblock.getLBConfig().defaultDist; radius = logblock.getLBConfig().defaultDist;
if (!prepareToolQuery) if (!prepareToolQuery)
loc = player.getLocation(); loc = player.getLocation();
@@ -351,7 +351,7 @@ public class QueryParams implements Cloneable
if (before == -1) if (before == -1)
throw new IllegalArgumentException("Faile to parse time spec for '" + param + "'"); throw new IllegalArgumentException("Faile to parse time spec for '" + param + "'");
} else if (param.equals("sum")) { } else if (param.equals("sum")) {
if (values == null || values.length != 1) if (values.length != 1)
throw new IllegalArgumentException("No or wrong count of arguments for '" + param + "'"); throw new IllegalArgumentException("No or wrong count of arguments for '" + param + "'");
if (values[0].startsWith("p")) if (values[0].startsWith("p"))
sum = SummarizationMode.PLAYERS; sum = SummarizationMode.PLAYERS;
@@ -398,8 +398,7 @@ public class QueryParams implements Cloneable
match = join(values, " ").replace("\\", "\\\\").replace("'", "\\'"); match = join(values, " ").replace("\\", "\\\\").replace("'", "\\'");
} else } else
throw new IllegalArgumentException("Not a valid argument: '" + param + "'"); throw new IllegalArgumentException("Not a valid argument: '" + param + "'");
if (values != null) i += values.length;
i += values.length;
} }
if (types.size() > 0) if (types.size() > 0)
for (final Set<Integer> equivalent : getBlockEquivalents()) { for (final Set<Integer> equivalent : getBlockEquivalents()) {