Merge remote-tracking branch 'origin/master' into feature/mapping

This commit is contained in:
sk89q
2014-07-10 22:33:25 -07:00
5 changed files with 34 additions and 18 deletions

View File

@ -241,9 +241,15 @@ public final class CommandManager {
Throwable t = e.getCause();
actor.printError("Please report this error: [See console]");
actor.printRaw(t.getClass().getName() + ": " + t.getMessage());
t.printStackTrace();
logger.log(Level.SEVERE, "An unexpected error while handling a WorldEdit command", t);
} catch (CommandException e) {
actor.printError(e.getMessage());
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);
}
} finally {
EditSession editSession = locals.get(EditSession.class);