diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java index f4c5a71..fde6629 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java @@ -705,7 +705,6 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { String globalJSON = msgin.readUTF(); String primaryGroup = msgin.readUTF(); String nickname = msgin.readUTF(); - System.out.println(nickname); if(!ChatChannel.isChannel(chatchannel)) { return; @@ -727,7 +726,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { @Override public void run() { //Create VentureChatEvent - VentureChatEvent ventureChatEvent = new VentureChatEvent(null, senderName, primaryGroup, chatChannelObject, recipients, format, chat, globalJSON, hash, false); + VentureChatEvent ventureChatEvent = new VentureChatEvent(null, senderName, nickname, primaryGroup, chatChannelObject, recipients, format, chat, globalJSON, hash, false); //Fire event and wait for other plugin listeners to act on it Bukkit.getServer().getPluginManager().callEvent(ventureChatEvent); } diff --git a/MineverseChat/mineverse/Aust1n46/chat/api/events/VentureChatEvent.java b/MineverseChat/mineverse/Aust1n46/chat/api/events/VentureChatEvent.java index 3a3312c..4a2be47 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/api/events/VentureChatEvent.java +++ b/MineverseChat/mineverse/Aust1n46/chat/api/events/VentureChatEvent.java @@ -19,6 +19,7 @@ public class VentureChatEvent extends Event { private static final HandlerList handlers = new HandlerList(); private final MineverseChatPlayer mcp; private final String username; + private final String nickname; private final String playerPrimaryGroup; private final ChatChannel channel; private final Set recipients; @@ -28,10 +29,11 @@ public class VentureChatEvent extends Event { private final int hash; private final boolean bungee; - public VentureChatEvent(MineverseChatPlayer mcp, String username, String playerPrimaryGroup, ChatChannel channel, Set recipients, String format, String chat, String globalJSON, int hash, boolean bungee) { + public VentureChatEvent(MineverseChatPlayer mcp, String username, String nickname, String playerPrimaryGroup, ChatChannel channel, Set recipients, String format, String chat, String globalJSON, int hash, boolean bungee) { super(MineverseChat.ASYNC); this.mcp = mcp; this.username = username; + this.nickname = nickname; this.playerPrimaryGroup = playerPrimaryGroup; this.channel = channel; this.recipients = recipients; @@ -50,6 +52,10 @@ public class VentureChatEvent extends Event { return this.username; } + public String getNickname() { + return this.nickname; + } + public String getPlayerPrimaryGroup() { return this.playerPrimaryGroup; } diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java index 7a0766e..5d98318 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java @@ -456,7 +456,7 @@ public class ChatListener implements Listener { int hash = message.hashCode(); //Create VentureChatEvent - VentureChatEvent ventureChatEvent = new VentureChatEvent(mcp, mcp.getName(), MineverseChat.permission.getPrimaryGroup(mcp.getPlayer()), eventChannel, recipients, format, chat, globalJSON, hash, bungee); + VentureChatEvent ventureChatEvent = new VentureChatEvent(mcp, mcp.getName(), mcp.getNickname(), MineverseChat.permission.getPrimaryGroup(mcp.getPlayer()), eventChannel, recipients, format, chat, globalJSON, hash, bungee); //Fire event and wait for other plugin listeners to act on it Bukkit.getServer().getPluginManager().callEvent(ventureChatEvent); //Call method to send the processed chat