Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2025-06-28 22:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to add prefixes to adminchat

Browse Source
This commit is contained in:
Telesphoreo
2023-08-29 16:06:16 -05:00
parent 2c7440804c
commit 2a2152603b
5 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/dev/plex/util/PlexUtils.java
View File

@ -284,7 +284,7 @@ public class PlexUtils implements PlexBase
});
}
public static List<UUID> adminChat(String senderName, String message, UUID... ignore)
public static List<UUID> adminChat(String senderName, String prefix, String message, UUID... ignore)
{
List<UUID> sent = Lists.newArrayList();
for (Player player : Bukkit.getOnlinePlayers())
@ -295,7 +295,7 @@ public class PlexUtils implements PlexBase
}
if (player.hasPermission("plex.adminchat"))
{
player.sendMessage(PlexUtils.messageComponent("adminChatFormat", senderName, message).replaceText(ChatListener.URL_REPLACEMENT_CONFIG));
player.sendMessage(PlexUtils.messageComponent("adminChatFormat", senderName, prefix, message).replaceText(ChatListener.URL_REPLACEMENT_CONFIG));
sent.add(player.getUniqueId());
}
}

3
server/src/main/java/dev/plex/util/redis/MessageUtil.java
View File

@ -16,6 +16,7 @@ import redis.clients.jedis.JedisPubSub;
import java.util.UUID;
import static dev.plex.PlexBase.plugin;
import static dev.plex.util.PlexUtils.messageComponent;
public class MessageUtil
@ -40,7 +41,7 @@ public class MessageUtil
{
}.getType());
String sender = object.getString("sender").isEmpty() ? "CONSOLE" : object.getString("sender");
PlexUtils.adminChat(sender, object.getString("message"), ignore);
PlexUtils.adminChat(sender, plugin.getPlayerCache().getPlexPlayer(Bukkit.getPlayer(sender).getUniqueId()).getPrefix(), object.getString("message"), ignore);
String[] server = object.getString("server").split(":");
if (!Bukkit.getServer().getIp().equalsIgnoreCase(server[0]) || Bukkit.getServer().getPort() != Integer.parseInt(server[1]))
{