From 78988680e9c6d36c33a24c9e41f14760c77fd3d7 Mon Sep 17 00:00:00 2001 From: sk89q Date: Sat, 12 Jul 2014 13:09:44 -0700 Subject: [PATCH 1/3] [Bukkit] Add support for MC 1.7.10. --- .../resources/nmsblocks/CBXNmsBlock_1710.class | Bin 0 -> 14282 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/bukkit/resources/nmsblocks/CBXNmsBlock_1710.class diff --git a/src/bukkit/resources/nmsblocks/CBXNmsBlock_1710.class b/src/bukkit/resources/nmsblocks/CBXNmsBlock_1710.class new file mode 100644 index 0000000000000000000000000000000000000000..b8525885a66d8b9ba84da1171fcbe9a688fbd410 GIT binary patch literal 14282 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 literal 0 HcmV?d00001 From e21b21d2667873f09093ecaf2df707b361b458b7 Mon Sep 17 00:00:00 2001 From: sk89q Date: Sat, 12 Jul 2014 13:15:34 -0700 Subject: [PATCH 2/3] Update changelog for 5.6.2 and 5.6.3. --- CHANGELOG.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b29a8d1dd..7584358a5 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,15 @@ +5.6.3 + +Note: We are working on WorldEdit 6.x so 5.x are maintenance releases and will +mostly contain bug fixes and minor changes. + +- Added support for CraftBukkit 1.7.10. +- Fixed activated hoppers rotating incorrectly. +- Fixed listing schematics with directories in the folder. + +5.6.2 +- Backport 1.7.9 support to WE 5.x + 5.6.1 - Added support for Minecraft 1.7.5 on Bukkit. - Added //flora command to place flora over grass. From 6dcbc8eb66ca2724a668c0fe80bdf89f88edbf7e Mon Sep 17 00:00:00 2001 From: sk89q Date: Mon, 14 Jul 2014 22:50:45 -0700 Subject: [PATCH 3/3] Fix a confusion of loggers for command logging. --- .../extension/platform/CommandManager.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/sk89q/worldedit/extension/platform/CommandManager.java b/src/main/java/com/sk89q/worldedit/extension/platform/CommandManager.java index 49b21d797..85cb40134 100644 --- a/src/main/java/com/sk89q/worldedit/extension/platform/CommandManager.java +++ b/src/main/java/com/sk89q/worldedit/extension/platform/CommandManager.java @@ -65,7 +65,8 @@ import static com.google.common.base.Preconditions.checkNotNull; public final class CommandManager { public static final Pattern COMMAND_CLEAN_PATTERN = Pattern.compile("^[/]+"); - private static final Logger logger = Logger.getLogger(CommandManager.class.getCanonicalName()); + private static final Logger log = Logger.getLogger(CommandManager.class.getCanonicalName()); + private static final Logger commandLog = Logger.getLogger(CommandManager.class.getCanonicalName() + ".CommandLog"); private static final java.util.regex.Pattern numberFormatExceptionPattern = java.util.regex.Pattern.compile("^For input string: \"(.*)\"$"); private final WorldEdit worldEdit; @@ -88,7 +89,7 @@ public final class CommandManager { worldEdit.getEventBus().register(this); // Setup the logger - logger.addHandler(dynamicHandler); + commandLog.addHandler(dynamicHandler); dynamicHandler.setFormatter(new LogFormat()); // Set up the commands manager @@ -98,7 +99,7 @@ public final class CommandManager { builder.addBinding(new WorldEditBinding(worldEdit)); builder.addExceptionConverter(new WorldEditExceptionConverter(worldEdit)); builder.addInvokeListener(new LegacyCommandsHandler()); - builder.addInvokeListener(new CommandLoggingHandler(worldEdit, logger)); + builder.addInvokeListener(new CommandLoggingHandler(worldEdit, commandLog)); dispatcher = new CommandGraph() .builder(builder) @@ -146,7 +147,7 @@ public final class CommandManager { } void register(Platform platform) { - logger.log(Level.FINE, "Registering commands with " + platform.getClass().getCanonicalName()); + log.log(Level.FINE, "Registering commands with " + platform.getClass().getCanonicalName()); LocalConfiguration config = platform.getConfiguration(); boolean logging = config.logCommands; @@ -155,18 +156,17 @@ public final class CommandManager { // Register log if (!logging || path.isEmpty()) { dynamicHandler.setHandler(null); - logger.setLevel(Level.OFF); + commandLog.setLevel(Level.OFF); } else { File file = new File(config.getWorkingDirectory(), path); + commandLog.setLevel(Level.ALL); - logger.setLevel(Level.ALL); - - logger.log(Level.INFO, "Logging WorldEdit commands to " + file.getAbsolutePath()); + log.log(Level.INFO, "Logging WorldEdit commands to " + file.getAbsolutePath()); try { dynamicHandler.setHandler(new FileHandler(file.getAbsolutePath(), true)); } catch (IOException e) { - logger.log(Level.WARNING, "Could not use command log file " + path + ": " + e.getMessage()); + log.log(Level.WARNING, "Could not use command log file " + path + ": " + e.getMessage()); } } @@ -241,14 +241,14 @@ public final class CommandManager { Throwable t = e.getCause(); actor.printError("Please report this error: [See console]"); actor.printRaw(t.getClass().getName() + ": " + t.getMessage()); - logger.log(Level.SEVERE, "An unexpected error while handling a WorldEdit command", t); + log.log(Level.SEVERE, "An unexpected error while handling a WorldEdit command", t); } catch (CommandException e) { String message = e.getMessage(); if (message != null) { actor.printError(e.getMessage()); } else { actor.printError("An unknown error has occurred! Please see console."); - logger.log(Level.SEVERE, "An unknown error occurred", e); + log.log(Level.SEVERE, "An unknown error occurred", e); } } finally { EditSession editSession = locals.get(EditSession.class); @@ -298,7 +298,7 @@ public final class CommandManager { } public static Logger getLogger() { - return logger; + return commandLog; } }