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

Merge pull request #371 from DerFlash/master

Browse Source 
Better location query mechanism
This commit is contained in:
md-5
2013-03-10 14:02:38 -07:00
parent c7c6978390 f81ef495c2
commit ce0aa22ec0
2 changed files with 78 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -57,7 +57,7 @@
<dependency> <dependency>
<groupId>com.sk89q</groupId> <groupId>com.sk89q</groupId>
<artifactId>worldedit</artifactId> <artifactId>worldedit</artifactId>
<version>5.4.6-SNAPSHOT</version> <version>5.5</version>
</dependency> </dependency>
</dependencies> </dependencies>

95
src/main/java/de/diddiz/LogBlock/QueryParams.java
View File

@@ -270,15 +270,31 @@ public final class QueryParams implements Cloneable
for (final String victimName : victims) for (final String victimName : victims)
where.append("victims.playername != '").append(victimName).append("' AND "); where.append("victims.playername != '").append(victimName).append("' AND ");
if (loc != null) { if (loc != null) {
if (radius == 0) if (radius == 0)
where.append("x = '").append(loc.getBlockX()).append("' AND y = '").append(loc.getBlockY()).append("' AND z = '").append(loc.getBlockZ()).append("' AND "); compileLocationQuery(
else if (radius > 0) where,
where.append("x > '").append(loc.getBlockX() - radius).append("' AND x < '").append(loc.getBlockX() + radius).append("' AND y > '").append(loc.getBlockY() - radius).append("' AND y < '").append(loc.getBlockY() + radius).append("' AND z > '").append(loc.getBlockZ() - radius).append("' AND z < '").append(loc.getBlockZ() + radius).append("' AND "); loc.getBlockX(), loc.getBlockX(),
} else if (sel != null) loc.getBlockY(), loc.getBlockY(),
where.append("x >= '").append(sel.getSelection().getMinimumPoint().getBlockX()).append("' AND x <= '").append(sel.getSelection().getMaximumPoint().getBlockX()) loc.getBlockZ(), loc.getBlockZ()
.append("' AND y >= '").append(sel.getSelection().getMinimumPoint().getBlockY()).append("' AND y <= '").append(sel.getSelection().getMaximumPoint().getBlockY()) );
.append("' AND z >= '").append(sel.getSelection().getMinimumPoint().getBlockZ()).append("' AND z <= '").append(sel.getSelection().getMaximumPoint().getBlockZ()).append("' AND ");
else if (radius > 0)
compileLocationQuery(
where,
loc.getBlockX() - radius + 1, loc.getBlockX() + radius - 1,
loc.getBlockY() - radius + 1, loc.getBlockY() + radius - 1,
loc.getBlockZ() - radius + 1, loc.getBlockZ() + radius - 1
);
} else if (sel != null)
compileLocationQuery(
where,
sel.getSelection().getMinimumPoint().getBlockX(), sel.getSelection().getMaximumPoint().getBlockX(),
sel.getSelection().getMinimumPoint().getBlockY(), sel.getSelection().getMaximumPoint().getBlockY(),
sel.getSelection().getMinimumPoint().getBlockZ(), sel.getSelection().getMaximumPoint().getBlockZ()
);
} else { } else {
switch (blockChangeType) { switch (blockChangeType) {
case ALL: case ALL:
@@ -368,15 +384,31 @@ public final class QueryParams implements Cloneable
} }
break; break;
} }
if (loc != null) { if (loc != null) {
if (radius == 0) if (radius == 0)
where.append("x = '").append(loc.getBlockX()).append("' AND y = '").append(loc.getBlockY()).append("' AND z = '").append(loc.getBlockZ()).append("' AND "); compileLocationQuery(
else if (radius > 0) where,
where.append("x > '").append(loc.getBlockX() - radius).append("' AND x < '").append(loc.getBlockX() + radius).append("' AND y > '").append(loc.getBlockY() - radius).append("' AND y < '").append(loc.getBlockY() + radius).append("' AND z > '").append(loc.getBlockZ() - radius).append("' AND z < '").append(loc.getBlockZ() + radius).append("' AND "); loc.getBlockX(), loc.getBlockX(),
} else if (sel != null) loc.getBlockY(), loc.getBlockY(),
where.append("x >= '").append(sel.getSelection().getMinimumPoint().getBlockX()).append("' AND x <= '").append(sel.getSelection().getMaximumPoint().getBlockX()) loc.getBlockZ(), loc.getBlockZ()
.append("' AND y >= '").append(sel.getSelection().getMinimumPoint().getBlockY()).append("' AND y <= '").append(sel.getSelection().getMaximumPoint().getBlockY()). );
append("' AND z >= '").append(sel.getSelection().getMinimumPoint().getBlockZ()).append("' AND z <= '").append(sel.getSelection().getMaximumPoint().getBlockZ()).append("' AND ");
else if (radius > 0)
compileLocationQuery(
where,
loc.getBlockX() - radius + 1, loc.getBlockX() + radius - 1,
loc.getBlockY() - radius + 1, loc.getBlockY() + radius - 1,
loc.getBlockZ() - radius + 1, loc.getBlockZ() + radius - 1
);
} else if (sel != null)
compileLocationQuery(
where,
sel.getSelection().getMinimumPoint().getBlockX(), sel.getSelection().getMaximumPoint().getBlockX(),
sel.getSelection().getMinimumPoint().getBlockY(), sel.getSelection().getMaximumPoint().getBlockY(),
sel.getSelection().getMinimumPoint().getBlockZ(), sel.getSelection().getMaximumPoint().getBlockZ()
);
} }
if (!players.isEmpty() && sum != SummarizationMode.PLAYERS && blockChangeType != BlockChangeType.KILLS) if (!players.isEmpty() && sum != SummarizationMode.PLAYERS && blockChangeType != BlockChangeType.KILLS)
if (!excludePlayersMode) { if (!excludePlayersMode) {
@@ -399,6 +431,33 @@ public final class QueryParams implements Cloneable
return where.toString(); return where.toString();
} }
private void compileLocationQuery(StringBuilder where, int blockX, int blockX2, int blockY, int blockY2, int blockZ, int blockZ2) {
compileLocationQueryPart(where, "x", blockX, blockX2);
where.append(" AND ");
compileLocationQueryPart(where, "y", blockY, blockY2);
where.append(" AND ");
compileLocationQueryPart(where, "z", blockZ, blockZ2);
where.append(" AND ");
}
private void compileLocationQueryPart(StringBuilder where, String locValue, int loc, int loc2) {
int min = Math.min(loc, loc2);
int max = Math.max(loc2, loc);
if (min == max)
where.append(locValue).append(" = ").append(min);
else if (max - min > 50)
where.append(locValue).append(" >= ").append(min).append(" AND ").append(locValue).append(" <= ").append(max);
else {
where.append(locValue).append(" in (");
for (int c = min; c < max; c++) {
where.append(c).append(",");
}
where.append(max);
where.append(")");
}
}
public void parseArgs(CommandSender sender, List<String> args) throws IllegalArgumentException { public void parseArgs(CommandSender sender, List<String> args) throws IllegalArgumentException {
if (args == null || args.isEmpty()) if (args == null || args.isEmpty())
throw new IllegalArgumentException("No parameters specified."); throw new IllegalArgumentException("No parameters specified.");