From ae02c2c9b67da7a27da63c904de28ac7fe12d144 Mon Sep 17 00:00:00 2001 From: Pepich Date: Fri, 19 Jan 2018 03:34:57 +0100 Subject: [PATCH] Fixed stripcolor, fixed %% escaping --- src/com/redstoner/modules/socialspy/Socialspy.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/com/redstoner/modules/socialspy/Socialspy.java b/src/com/redstoner/modules/socialspy/Socialspy.java index b5a8fb3..8faa82c 100644 --- a/src/com/redstoner/modules/socialspy/Socialspy.java +++ b/src/com/redstoner/modules/socialspy/Socialspy.java @@ -25,7 +25,7 @@ import com.redstoner.modules.datamanager.DataManager; import net.nemez.chatapi.click.Message; @Commands(CommandHolderType.File) -@Version(major = 4, minor = 0, revision = 0, compatible = 4) +@Version(major = 4, minor = 0, revision = 1, compatible = 4) public class Socialspy implements CoreModule { @Command(hook = "config_prefix_default") @@ -130,7 +130,7 @@ public class Socialspy implements CoreModule @Command(hook = "commands_list") public boolean commands_list(CommandSender sender) { - ArrayList message = new ArrayList(); + ArrayList message = new ArrayList<>(); JSONArray commands = (JSONArray) DataManager.getOrDefault(sender, "commands", getDefaultCommandList()); if (commands == null || commands.size() == 0) message.add("You are not listening to any commands!"); @@ -265,7 +265,7 @@ public class Socialspy implements CoreModule if (s.equals("on")) message = ChatColor.stripColor(message); else if (s.equals("partial")) - message = message.replace("§", "&"); + message = message.replace("§", "&&"); String format = (String) DataManager.getOrDefault(formatHolder, "format", getDefaultFormat()); // Replace escaped % with placeholder format = format.replace("%%", "§§"); @@ -284,7 +284,7 @@ public class Socialspy implements CoreModule format = format.replace("%c", command); format = format.replace("%m", message); // Convert placeholder back - format = format.replace("§§", "%%"); + format = format.replace("§§", "%"); return format; } @@ -305,7 +305,7 @@ public class Socialspy implements CoreModule if (s.equals("on")) message = ChatColor.stripColor(message); else if (s.equals("partial")) - message = message.replace("§", "&"); + message = message.replace("§", "&&"); String format = (String) DataManager.getOrDefault(formatHolder, "format", getDefaultFormat()); // Replace escaped % with placeholder format = format.replace("%%", "§§"); @@ -324,7 +324,7 @@ public class Socialspy implements CoreModule format = format.replace("%c", command); format = format.replace("%m", message); // Convert placeholder back - format = format.replace("§§", "%%"); + format = format.replace("§§", "%"); return format; }