diff options
author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-07-08 23:19:21 +0100 |
---|---|---|
committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-07-08 23:19:21 +0100 |
commit | f27339caf8d7d656919518c6e8933d3ce9af0840 (patch) | |
tree | 640015f25138f2006bea7db51454112a208f0012 /src | |
parent | 7742e12aff5c1dc8f9b64513b467c5b65e6ffcbc (diff) | |
download | craftbukkit-f27339caf8d7d656919518c6e8933d3ce9af0840.tar craftbukkit-f27339caf8d7d656919518c6e8933d3ce9af0840.tar.gz craftbukkit-f27339caf8d7d656919518c6e8933d3ce9af0840.tar.lz craftbukkit-f27339caf8d7d656919518c6e8933d3ce9af0840.tar.xz craftbukkit-f27339caf8d7d656919518c6e8933d3ce9af0840.zip |
SPIGOT-977: Use vanilla's handling for command messages for vanilla commands
Fixes gamerules that control the output of those messages
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java index 96a0ae1f..de788d61 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java @@ -97,9 +97,7 @@ public final class VanillaCommandWrapper extends VanillaCommand { chatmessage.getChatModifier().setColor(EnumChatFormat.RED); icommandlistener.sendMessage(chatmessage); } catch (CommandException commandexception) { - ChatMessage chatmessage = new ChatMessage(commandexception.getMessage(), commandexception.getArgs()); - chatmessage.getChatModifier().setColor(EnumChatFormat.RED); - icommandlistener.sendMessage(chatmessage); + CommandAbstract.a(icommandlistener, vanillaCommand, 1, commandexception.getMessage(), commandexception.getArgs()); } finally { lastSender = oldSender; } @@ -120,9 +118,7 @@ public final class VanillaCommandWrapper extends VanillaCommand { chatmessage1.getChatModifier().setColor(EnumChatFormat.RED); icommandlistener.sendMessage(chatmessage1); } catch (CommandException commandexception) { - ChatMessage chatmessage2 = new ChatMessage(commandexception.getMessage(), commandexception.getArgs()); - chatmessage2.getChatModifier().setColor(EnumChatFormat.RED); - icommandlistener.sendMessage(chatmessage2); + CommandAbstract.a(icommandlistener, vanillaCommand, 1, commandexception.getMessage(), commandexception.getArgs()); } catch (Throwable throwable) { ChatMessage chatmessage3 = new ChatMessage("commands.generic.exception", new Object[0]); chatmessage3.getChatModifier().setColor(EnumChatFormat.RED); |