Redstoner/Modules
Archived
0
Fork 0
Code Activity

Fixed stripcolor, fixed %% escaping

Browse Source
This commit is contained in:
Pepich
2018-01-19 03:34:57 +01:00
parent 2d0d57955e
commit ae02c2c9b6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/redstoner/modules/socialspy/Socialspy.java
View File

@@ -25,7 +25,7 @@ import com.redstoner.modules.datamanager.DataManager;
import net.nemez.chatapi.click.Message; import net.nemez.chatapi.click.Message;
@Commands(CommandHolderType.File) @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 public class Socialspy implements CoreModule
{ {
@Command(hook = "config_prefix_default") @Command(hook = "config_prefix_default")
@@ -130,7 +130,7 @@ public class Socialspy implements CoreModule
@Command(hook = "commands_list") @Command(hook = "commands_list")
public boolean commands_list(CommandSender sender) public boolean commands_list(CommandSender sender)
{ {
ArrayList<String> message = new ArrayList<String>(); ArrayList<String> message = new ArrayList<>();
JSONArray commands = (JSONArray) DataManager.getOrDefault(sender, "commands", getDefaultCommandList()); JSONArray commands = (JSONArray) DataManager.getOrDefault(sender, "commands", getDefaultCommandList());
if (commands == null || commands.size() == 0) if (commands == null || commands.size() == 0)
message.add("You are not listening to any commands!"); message.add("You are not listening to any commands!");
@@ -265,7 +265,7 @@ public class Socialspy implements CoreModule
if (s.equals("on")) if (s.equals("on"))
message = ChatColor.stripColor(message); message = ChatColor.stripColor(message);
else if (s.equals("partial")) else if (s.equals("partial"))
message = message.replace("§", "&"); message = message.replace("§", "&&");
String format = (String) DataManager.getOrDefault(formatHolder, "format", getDefaultFormat()); String format = (String) DataManager.getOrDefault(formatHolder, "format", getDefaultFormat());
// Replace escaped % with placeholder // Replace escaped % with placeholder
format = format.replace("%%", "§§"); format = format.replace("%%", "§§");
@@ -284,7 +284,7 @@ public class Socialspy implements CoreModule
format = format.replace("%c", command); format = format.replace("%c", command);
format = format.replace("%m", message); format = format.replace("%m", message);
// Convert placeholder back // Convert placeholder back
format = format.replace("§§", "%%"); format = format.replace("§§", "%");
return format; return format;
} }
@@ -305,7 +305,7 @@ public class Socialspy implements CoreModule
if (s.equals("on")) if (s.equals("on"))
message = ChatColor.stripColor(message); message = ChatColor.stripColor(message);
else if (s.equals("partial")) else if (s.equals("partial"))
message = message.replace("§", "&"); message = message.replace("§", "&&");
String format = (String) DataManager.getOrDefault(formatHolder, "format", getDefaultFormat()); String format = (String) DataManager.getOrDefault(formatHolder, "format", getDefaultFormat());
// Replace escaped % with placeholder // Replace escaped % with placeholder
format = format.replace("%%", "§§"); format = format.replace("%%", "§§");
@@ -324,7 +324,7 @@ public class Socialspy implements CoreModule
format = format.replace("%c", command); format = format.replace("%c", command);
format = format.replace("%m", message); format = format.replace("%m", message);
// Convert placeholder back // Convert placeholder back
format = format.replace("§§", "%%"); format = format.replace("§§", "%");
return format; return format;
} }