From bd59a5c449be3819d9a6a3467b00e3c3b090efa2 Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Sun, 29 Dec 2019 17:20:20 -0500 Subject: [PATCH] Changed plugin message channel from 'venturechat:' to 'venturechat:data' --- .../mineverse/Aust1n46/chat/MineverseChat.java | 8 ++++---- .../chat/bungee/MineverseChatBungee.java | 16 ++++++++-------- .../Aust1n46/chat/listeners/ChatListener.java | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java index e7086d3..92d1c37 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java @@ -440,8 +440,8 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { */ } Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Establishing BungeeCord")); - Bukkit.getMessenger().registerOutgoingPluginChannel(this, "venturechat:"); - Bukkit.getMessenger().registerIncomingPluginChannel(this, "venturechat:", this); + Bukkit.getMessenger().registerOutgoingPluginChannel(this, "venturechat:data"); + Bukkit.getMessenger().registerIncomingPluginChannel(this, "venturechat:data", this); if(pluginManager.isPluginEnabled("Towny")) { Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Enabling Towny Formatting")); } @@ -752,7 +752,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { out.writeBoolean(mcp.getMessageToggle()); } for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { - p.getPlayer().sendPluginMessage(this, "venturechat:", outstream.toByteArray()); + p.getPlayer().sendPluginMessage(this, "venturechat:data", outstream.toByteArray()); break; } // System.out.println("Sync start bottom..."); @@ -792,7 +792,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { @Override public void onPluginMessageReceived(String channel, Player player, byte[] message) { - if(!channel.equals("venturechat:")) { + if(!channel.equals("venturechat:data")) { return; } try { diff --git a/MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java b/MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java index adf0146..c327267 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java +++ b/MineverseChat/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java @@ -84,7 +84,7 @@ public class MineverseChatBungee extends Plugin implements Listener { boolean messageToggle = playerData.getBoolean(uuidString + ".messagetoggle"); players.add(new SynchronizedMineverseChatPlayer(uuid, listening, mutes, ignores, spy, messageToggle)); } - this.getProxy().registerChannel("venturechat:"); + this.getProxy().registerChannel("venturechat:data"); this.getProxy().getPluginManager().registerListener(this, this); if(bungeeconfig.getBoolean("muting")) { getProxy().getPluginManager().registerCommand(this, new GlobalMute(this, "globalmute")); @@ -136,7 +136,7 @@ public class MineverseChatBungee extends Plugin implements Listener { @EventHandler public void onPluginMessage(PluginMessageEvent ev) { //System.out.println(ev.getTag() + "," + ev.getSender().toString() + "," + (ev.getSender() instanceof Server)); - if(!ev.getTag().equals("venturechat:") && !ev.getTag().contains("viaversion:")) { + if(!ev.getTag().equals("venturechat:data") && !ev.getTag().contains("viaversion:")) { return; } if(!(ev.getSender() instanceof Server)) { @@ -172,7 +172,7 @@ public class MineverseChatBungee extends Plugin implements Listener { if(!bungeeToggle && !getProxy().getServers().get(send).getName().equalsIgnoreCase(ser.getInfo().getName())) { continue; } - getProxy().getServers().get(send).sendData("venturechat:", outstream.toByteArray()); + getProxy().getServers().get(send).sendData("venturechat:data", outstream.toByteArray()); } } } @@ -192,7 +192,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(channel); for(String send : getProxy().getServers().keySet()) { if(getProxy().getServers().get(send).getPlayers().size() > 0) { - getProxy().getServers().get(send).sendData("venturechat:", outstream.toByteArray()); + getProxy().getServers().get(send).sendData("venturechat:data", outstream.toByteArray()); } } } @@ -224,7 +224,7 @@ public class MineverseChatBungee extends Plugin implements Listener { } smcp.clearMessageData(); Server server = getProxy().getPlayer(name).getServer(); - server.sendData("venturechat:", outstream.toByteArray()); + server.sendData("venturechat:data", outstream.toByteArray()); } } } @@ -234,7 +234,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(hash); for(String send : getProxy().getServers().keySet()) { if(getProxy().getServers().get(send).getPlayers().size() > 0) { - getProxy().getServers().get(send).sendData("venturechat:", outstream.toByteArray()); + getProxy().getServers().get(send).sendData("venturechat:data", outstream.toByteArray()); } } } @@ -253,7 +253,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(sender); for(String send : getProxy().getServers().keySet()) { if(getProxy().getServers().get(send).getPlayers().size() > 0) { - getProxy().getServers().get(send).sendData("venturechat:", outstream.toByteArray()); + getProxy().getServers().get(send).sendData("venturechat:data", outstream.toByteArray()); } } } @@ -276,7 +276,7 @@ public class MineverseChatBungee extends Plugin implements Listener { out.writeUTF(player); out.writeUTF(sender); if(getProxy().getServers().get(server).getPlayers().size() > 0) { - getProxy().getServers().get(server).sendData("venturechat:", outstream.toByteArray()); + getProxy().getServers().get(server).sendData("venturechat:data", outstream.toByteArray()); } } } diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java index 919d225..26359b6 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java @@ -739,7 +739,7 @@ public class ChatListener implements Listener { if(plugin.getConfig().getString("loglevel", "info").equals("debug")) { System.out.println(out.size() + " bytes size with json"); } - mcp.getPlayer().sendPluginMessage(plugin, "venturechat:", byteOutStream.toByteArray()); + mcp.getPlayer().sendPluginMessage(plugin, "venturechat:data", byteOutStream.toByteArray()); //PluginMessageRecipient test = (PluginMessageRecipient) mcp.getPlayer(); //System.out.println("Listening plugin channels?");