Changed plugin message channel from 'venturechat:' to 'venturechat:data'

This commit is contained in:
Aust1n46 2019-12-29 17:20:20 -05:00
parent 975700e606
commit bd59a5c449
3 changed files with 13 additions and 13 deletions

View File

@ -440,8 +440,8 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
*/ */
} }
Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Establishing BungeeCord")); Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Establishing BungeeCord"));
Bukkit.getMessenger().registerOutgoingPluginChannel(this, "venturechat:"); Bukkit.getMessenger().registerOutgoingPluginChannel(this, "venturechat:data");
Bukkit.getMessenger().registerIncomingPluginChannel(this, "venturechat:", this); Bukkit.getMessenger().registerIncomingPluginChannel(this, "venturechat:data", this);
if(pluginManager.isPluginEnabled("Towny")) { if(pluginManager.isPluginEnabled("Towny")) {
Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Enabling Towny Formatting")); 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()); out.writeBoolean(mcp.getMessageToggle());
} }
for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { for(MineverseChatPlayer p : MineverseChat.onlinePlayers) {
p.getPlayer().sendPluginMessage(this, "venturechat:", outstream.toByteArray()); p.getPlayer().sendPluginMessage(this, "venturechat:data", outstream.toByteArray());
break; break;
} }
// System.out.println("Sync start bottom..."); // System.out.println("Sync start bottom...");
@ -792,7 +792,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
@Override @Override
public void onPluginMessageReceived(String channel, Player player, byte[] message) { public void onPluginMessageReceived(String channel, Player player, byte[] message) {
if(!channel.equals("venturechat:")) { if(!channel.equals("venturechat:data")) {
return; return;
} }
try { try {

View File

@ -84,7 +84,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
boolean messageToggle = playerData.getBoolean(uuidString + ".messagetoggle"); boolean messageToggle = playerData.getBoolean(uuidString + ".messagetoggle");
players.add(new SynchronizedMineverseChatPlayer(uuid, listening, mutes, ignores, spy, 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); this.getProxy().getPluginManager().registerListener(this, this);
if(bungeeconfig.getBoolean("muting")) { if(bungeeconfig.getBoolean("muting")) {
getProxy().getPluginManager().registerCommand(this, new GlobalMute(this, "globalmute")); getProxy().getPluginManager().registerCommand(this, new GlobalMute(this, "globalmute"));
@ -136,7 +136,7 @@ public class MineverseChatBungee extends Plugin implements Listener {
@EventHandler @EventHandler
public void onPluginMessage(PluginMessageEvent ev) { public void onPluginMessage(PluginMessageEvent ev) {
//System.out.println(ev.getTag() + "," + ev.getSender().toString() + "," + (ev.getSender() instanceof Server)); //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; return;
} }
if(!(ev.getSender() instanceof Server)) { 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())) { if(!bungeeToggle && !getProxy().getServers().get(send).getName().equalsIgnoreCase(ser.getInfo().getName())) {
continue; 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); out.writeUTF(channel);
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) { 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(); smcp.clearMessageData();
Server server = getProxy().getPlayer(name).getServer(); 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); out.writeUTF(hash);
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) { 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); out.writeUTF(sender);
for(String send : getProxy().getServers().keySet()) { for(String send : getProxy().getServers().keySet()) {
if(getProxy().getServers().get(send).getPlayers().size() > 0) { 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(player);
out.writeUTF(sender); out.writeUTF(sender);
if(getProxy().getServers().get(server).getPlayers().size() > 0) { 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());
} }
} }
} }

View File

@ -739,7 +739,7 @@ public class ChatListener implements Listener {
if(plugin.getConfig().getString("loglevel", "info").equals("debug")) { if(plugin.getConfig().getString("loglevel", "info").equals("debug")) {
System.out.println(out.size() + " bytes size with json"); 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(); //PluginMessageRecipient test = (PluginMessageRecipient) mcp.getPlayer();
//System.out.println("Listening plugin channels?"); //System.out.println("Listening plugin channels?");