diff options
| -rw-r--r-- | src/main/java/net/minecraft/server/PlayerConnection.java | 10 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/TextWrapper.java | 24 |
2 files changed, 1 insertions, 33 deletions
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java index 6aa7a21b..6444a2f7 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -715,14 +715,6 @@ public class PlayerConnection extends Connection { if (i == 1 && !packet3chat.isServer()) { return; } - - // CraftBukkit start - String message = packet3chat.message; - for (final String line : org.bukkit.craftbukkit.TextWrapper.wrapText(message)) { - this.networkManager.queue(new Packet3Chat(line)); - } - return; - // CraftBukkit end } // CraftBukkit start @@ -830,7 +822,7 @@ public class PlayerConnection extends Connection { // CraftBukkit start if (this.player.getChatFlags() == 1 && !s.startsWith("/")) { - this.sendPacket(new Packet3Chat("Cannot send chat message.")); + this.sendPacket(new Packet3Chat(ChatMessage.e("chat.cannotSend").a(EnumChatFormat.RED))); return; } diff --git a/src/main/java/org/bukkit/craftbukkit/TextWrapper.java b/src/main/java/org/bukkit/craftbukkit/TextWrapper.java deleted file mode 100644 index 8c748205..00000000 --- a/src/main/java/org/bukkit/craftbukkit/TextWrapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.bukkit.craftbukkit; - -import java.util.ArrayList; -import java.util.List; -import org.bukkit.ChatColor; - -public class TextWrapper { - public static List<String> wrapText(final String text) { - ArrayList<String> output = new ArrayList<String>(); - String[] lines = text.split("\n"); - String lastColor = null; - - for (String line : lines) { - if (lastColor != null) { - line = lastColor + line; - } - - output.add(line); - lastColor = ChatColor.getLastColors(line); - } - - return output; - } -} |