diff --git a/src/de/diddiz/LogBlock/CommandsHandler.java b/src/de/diddiz/LogBlock/CommandsHandler.java index ec3ee54..244b4d6 100644 --- a/src/de/diddiz/LogBlock/CommandsHandler.java +++ b/src/de/diddiz/LogBlock/CommandsHandler.java @@ -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); diff --git a/src/de/diddiz/LogBlock/QueryParams.java b/src/de/diddiz/LogBlock/QueryParams.java index ac92059..c73f54e 100644 --- a/src/de/diddiz/LogBlock/QueryParams.java +++ b/src/de/diddiz/LogBlock/QueryParams.java @@ -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; diff --git a/src/de/diddiz/LogBlock/Updater.java b/src/de/diddiz/LogBlock/Updater.java index 48a9f12..7f06b60 100644 --- a/src/de/diddiz/LogBlock/Updater.java +++ b/src/de/diddiz/LogBlock/Updater.java @@ -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"); diff --git a/src/de/diddiz/LogBlock/WorldEditor.java b/src/de/diddiz/LogBlock/WorldEditor.java index 6397239..05a6336 100644 --- a/src/de/diddiz/LogBlock/WorldEditor.java +++ b/src/de/diddiz/LogBlock/WorldEditor.java @@ -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) {