Fixed typos and last parameter not using the last timespec in some

cases
This commit is contained in:
Robin Kupper
2011-06-13 18:49:42 +02:00
parent a3970814da
commit ef5da80241
4 changed files with 7 additions and 9 deletions
+2 -2
View File
@@ -487,7 +487,7 @@ public class CommandsHandler implements CommandExecutor
return;
}
editor.start();
sender.sendMessage(ChatColor.GREEN + "Rollback finished successfully (" + editor.getElapsedTime() + " ms, " + editor.getSuccesses() + "/" + changes + " blocks" + (editor.getErrors() > 0 ? ChatColor.RED + ", " + editor.getErrors() + " errors" + ChatColor.GREEN : "") + (editor.getBlacklistCollisions() > 0 ? ", " + editor.getBlacklistCollisions() + " blacklist collisions" : "") + ")");
sender.sendMessage(ChatColor.GREEN + "Rollback finished successfully (" + editor.getElapsedTime() + " ms, " + editor.getSuccesses() + "/" + changes + " blocks" + (editor.getErrors() > 0 ? ", " + ChatColor.RED + editor.getErrors() + " errors" + ChatColor.GREEN : "") + (editor.getBlacklistCollisions() > 0 ? ", " + editor.getBlacklistCollisions() + " blacklist collisions" : "") + ")");
} catch (final Exception ex) {
sender.sendMessage(ChatColor.RED + "Exception, check error log");
log.log(Level.SEVERE, "[LogBlock Rollback] Exception: ", ex);
@@ -525,7 +525,7 @@ public class CommandsHandler implements CommandExecutor
return;
}
editor.start();
sender.sendMessage(ChatColor.GREEN + "Redo finished successfully (" + editor.getElapsedTime() + " ms, " + editor.getSuccesses() + "/" + changes + " blocks" + (editor.getErrors() > 0 ? ChatColor.RED + ", " + editor.getErrors() + " errors" + ChatColor.GREEN : "") + (editor.getBlacklistCollisions() > 0 ? ", " + editor.getBlacklistCollisions() + " blacklist collisions" : "") + ")");
sender.sendMessage(ChatColor.GREEN + "Redo finished successfully (" + editor.getElapsedTime() + " ms, " + editor.getSuccesses() + "/" + changes + " blocks" + (editor.getErrors() > 0 ? ", " + ChatColor.RED + editor.getErrors() + " errors" + ChatColor.GREEN : "") + (editor.getBlacklistCollisions() > 0 ? ", " + editor.getBlacklistCollisions() + " blacklist collisions" : "") + ")");
} catch (final Exception ex) {
sender.sendMessage(ChatColor.RED + "Exception, check error log");
log.log(Level.SEVERE, "[LogBlock Redo] Exception: ", ex);
+1 -1
View File
@@ -371,7 +371,7 @@ public class QueryParams implements Cloneable
loc = params.loc;
radius = params.radius;
sel = params.sel;
if (minutes == 0)
if (params.minutes != 0 || minutes != logblock.getConfig().defaultTime)
minutes = params.minutes;
sum = params.sum;
bct = params.bct;
+1 -1
View File
@@ -26,7 +26,7 @@ class Updater
if (config.getString("version").compareTo(logblock.getDescription().getVersion()) >= 0)
return false;
if (config.getString("version").compareTo("1.10") < 0) {
log.info("Updating config to 1.10 ...");
log.info("[LogBlock] Updating config to 1.10 ...");
String params = config.getString("lookup.toolQuery");
if (!params.contains("silent"))
config.setProperty("lookup.toolQuery", params + " silent");
+3 -5
View File
@@ -156,12 +156,10 @@ public class WorldEditor implements Runnable
if (signtext != null && (curtype == 63 || curtype == 68)) {
final Sign sign = (Sign)block.getState();
final String[] lines = signtext.split("\0");
try {
for (int i = 0; i < 4; i++)
sign.setLine(i, lines[i]);
} catch (final IndexOutOfBoundsException ex) {
if (lines.length < 4)
return PerformResult.ERROR;
}
for (int i = 0; i < 4; i++)
sign.setLine(i, lines[i]);
if (!sign.update())
return PerformResult.ERROR;
} else if (curtype == 26) {