From 40d913beafd8bbf3d11ff72e50cac1fba688f94c Mon Sep 17 00:00:00 2001 From: Teddy Date: Mon, 11 Jan 2016 12:35:44 +0000 Subject: [PATCH] Changed a List to reset each time its registered to prevent stats copying to the next game, automatic string escaping, party colour name changed to original colour --- .../game/arcade/managers/GameChatManager.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java index 7bdc6c35b..a9b27dcd2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java @@ -35,20 +35,22 @@ import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.managers.chat.ChatStatData; import org.apache.commons.lang.StringUtils; -import org.json.simple.JSONObject; +import org.jooq.tools.json.JSONObject; public class GameChatManager implements Listener { private ArcadeManager _manager; - private LinkedList _chatStats = new LinkedList(); + private LinkedList _chatStats; public GameChatManager(ArcadeManager manager) { _manager = manager; _manager.getPluginManager().registerEvents(this, _manager.getPlugin()); + + _chatStats = new LinkedList(); } @EventHandler @@ -144,8 +146,8 @@ public class GameChatManager implements Listener event.setFormat(levelStr + C.cDPurple + C.Bold + "Party " + C.cWhite + C.Bold + senderName + " " + C.cPurple + "%2$s"); format = event.getFormat().split(sender.getName())[0]; - name = _manager.GetColor(sender) + sender.getName(); - message = event.getFormat().split(sender.getName())[1].replace("%2$s", "") + JSONObject.escape(event.getMessage()); + name = C.cWhite + C.Bold + sender.getName() + C.Reset; + message = event.getFormat().split(sender.getName())[1].replace("%2$s", "") + JSONObject.escape(_manager.GetChat().getFilteredMessage(sender, event.getMessage())); if(!_manager.GetGame().IsLive()) { @@ -195,7 +197,7 @@ public class GameChatManager implements Listener name = _manager.GetColor(sender) + sender.getName(); } - message = event.getFormat().split(sender.getName())[1].replace("%2$s", "") + JSONObject.escape(event.getMessage()); + message = event.getFormat().split(sender.getName())[1].replace("%2$s", "") + JSONObject.escape(_manager.GetChat().getFilteredMessage(sender, event.getMessage())); } if (globalMessage)