From 210b0f8b4344b87a7ff8f914f2339e53b4cfd900 Mon Sep 17 00:00:00 2001 From: speed <43330808+speedxx@users.noreply.github.com> Date: Thu, 24 Dec 2020 20:07:09 -0500 Subject: [PATCH] unnecessary --- .../java/me/totalfreedom/totalfreedommod/ChatManager.java | 2 +- .../totalfreedommod/command/Command_consolesay.java | 4 ++-- .../totalfreedom/totalfreedommod/command/Command_say.java | 5 ++--- .../me/totalfreedom/totalfreedommod/discord/Discord.java | 8 ++++---- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java index a0668f6f..8d6d642d 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java @@ -138,7 +138,7 @@ public class ChatManager extends FreedomService // Send to discord if (!ConfigEntry.ADMIN_ONLY_MODE.getBoolean() && !Bukkit.hasWhitelist() && !plugin.pl.getPlayer(player).isMuted() && !plugin.tfg.inGuildChat(player)) { - plugin.dc.messageChatChannel(plugin.dc.deformat(player.getName()) + " \u00BB " + ChatColor.stripColor(message)); + plugin.dc.messageChatChannel(player.getName() + " \u00BB " + ChatColor.stripColor(message)); } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java index 7eadb4e9..4fb77b68 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java @@ -23,7 +23,7 @@ public class Command_consolesay extends FreedomCommand String message = StringUtils.join(args, " "); FUtil.bcastMsg(String.format("§7[CONSOLE] §c%s §8\u00BB §f%s", sender.getName(), StringUtils.join(args, " "))); - plugin.dc.messageChatChannel("[CONSOLE] " + plugin.dc.deformat(sender.getName()) + " \u00BB " + ChatColor.stripColor(message)); + plugin.dc.messageChatChannel("[CONSOLE] " + sender.getName() + " \u00BB " + ChatColor.stripColor(message)); return true; } -} +} \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_say.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_say.java index 7844c102..a79af9ae 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_say.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_say.java @@ -41,8 +41,7 @@ public class Command_say extends FreedomCommand } FUtil.bcastMsg(String.format("[Server:%s] %s", sender.getName(), message), ChatColor.LIGHT_PURPLE); - plugin.dc.messageChatChannel(String.format("[Server:%s] \u00BB %s", plugin.dc.deformat(sender.getName()), message)); - + plugin.dc.messageChatChannel(String.format("[Server:%s] \u00BB %s", sender.getName(), message)); return true; } -} +} \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java index 3f78bd10..bf62f31a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java @@ -290,7 +290,7 @@ public class Discord extends FreedomService if (event.getDeathMessage() != null) { - messageChatChannel("**" + deformat(event.getDeathMessage()) + "**"); + messageChatChannel("**" + event.getDeathMessage() + "**"); } } @@ -305,7 +305,7 @@ public class Discord extends FreedomService { if (!plugin.al.isVanished(event.getPlayer().getName())) { - messageChatChannel("**" + deformat(event.getPlayer().getName()) + " joined the server" + "**"); + messageChatChannel("**" + event.getPlayer().getName() + " joined the server" + "**"); } } @@ -314,7 +314,7 @@ public class Discord extends FreedomService { if (!plugin.al.isVanished(event.getPlayer().getName())) { - messageChatChannel("**" + deformat(event.getPlayer().getName()) + " left the server" + "**"); + messageChatChannel("**" + event.getPlayer().getName() + " left the server" + "**"); } } @@ -511,4 +511,4 @@ public class Discord extends FreedomService } return false; } -} +} \ No newline at end of file