Redstoner/Modules
Archived
0
Fork 0
Code Activity

Fixed format being applied, reverted wrong default format change

Browse Source
This commit is contained in:
Pepich
2017-05-09 11:10:38 +02:00
parent 8e645aeb01
commit 9d98b9dc6c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/redstoner/modules/message/Message.java
View File

@@ -18,7 +18,7 @@ import com.redstoner.modules.datamanager.DataManager;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
@Version(major = 3, minor = 0, revision = 7, compatible = 3) @Version(major = 3, minor = 0, revision = 8, compatible = 3)
public class Message implements Module public class Message implements Module
{ {
HashMap<CommandSender, CommandSender> replyTargets = new HashMap<CommandSender, CommandSender>(); HashMap<CommandSender, CommandSender> replyTargets = new HashMap<CommandSender, CommandSender>();
@@ -174,18 +174,19 @@ public class Message implements Module
{ {
if (p.equals(sender) || p.equals(target)) if (p.equals(sender) || p.equals(target))
continue; continue;
Utils.sendMessage(p, "", formatMessage(sender, target, message, command)); Utils.sendMessage(p, "", formatMessage(p, sender, target, message, command));
} }
else else
DataManager.setData(sender, "enabled", false); DataManager.setData(sender, "enabled", false);
} }
} }
private String formatMessage(CommandSender sender, CommandSender target, String message, String command) private String formatMessage(CommandSender formatHolder, CommandSender sender, CommandSender target, String message,
String command)
{ {
if ((boolean) DataManager.getOrDefault(sender, "stripcolor", false)) if ((boolean) DataManager.getOrDefault(formatHolder, "stripcolor", false))
message = ChatColor.stripColor(message); message = ChatColor.stripColor(message);
String format = (String) DataManager.getOrDefault(sender, "format", getDefaultFormat()); String format = (String) DataManager.getOrDefault(formatHolder, "format", getDefaultFormat());
// Replace escaped % with placeholder // Replace escaped % with placeholder
format = format.replace("%%", "§§"); format = format.replace("%%", "§§");
// Sender name // Sender name
@@ -209,7 +210,7 @@ public class Message implements Module
private static final String getDefaultFormat() private static final String getDefaultFormat()
{ {
return "%s &7to %t %p&7: %m"; return "%s &7to %t %p: %m";
} }
private static final String getDefaultPrefix() private static final String getDefaultPrefix()