diff --git a/pom.xml b/pom.xml index 1429a57..3974b85 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.t2code T2CodeLib - 16.9 + 17.0_beta-1 @@ -166,7 +166,7 @@ me.clip placeholderapi - 2.11.3 + 2.11.6 provided @@ -174,7 +174,7 @@ com.bencodez votingplugin - 6.12.1 + 6.18.3 provided @@ -182,7 +182,7 @@ net.kyori adventure-text-minimessage - 4.18.0-SNAPSHOT + 4.19.0 compile diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/T2CplmsgBcmd.java b/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/T2CplmsgBcmd.java index 2b7970e..bae5db0 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/T2CplmsgBcmd.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/T2CplmsgBcmd.java @@ -2,6 +2,7 @@ package net.t2code.t2codelib.BUNGEE.system.pluginMessaging; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; +import net.md_5.bungee.api.connection.Server; import net.md_5.bungee.api.event.PluginMessageEvent; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; @@ -16,6 +17,12 @@ public class T2CplmsgBcmd implements Listener { @EventHandler public void onPluginmessage(PluginMessageEvent event) { if (event.getTag().equalsIgnoreCase("t2c:bcmd")) { + + if (!(event.getSender() instanceof Server)) { + ProxyServer.getInstance().getConsole().sendMessage("§c[Security] Blocked unauthorized plugin message from a player ("+ event.getSender().toString() +")!"); + return; + } + event.setCancelled(true); DataInputStream stream = new DataInputStream(new ByteArrayInputStream(event.getData())); try { diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/autoResponse/T2CapiAutoResponse.java b/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/autoResponse/T2CapiAutoResponse.java index 50e46ec..1cba19d 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/autoResponse/T2CapiAutoResponse.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/autoResponse/T2CapiAutoResponse.java @@ -2,6 +2,7 @@ package net.t2code.t2codelib.BUNGEE.system.pluginMessaging.autoResponse; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; +import net.md_5.bungee.api.connection.Server; import net.md_5.bungee.api.event.PluginMessageEvent; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; @@ -16,6 +17,12 @@ public class T2CapiAutoResponse implements Listener { @EventHandler public void onPluginmessage(PluginMessageEvent event) { if (event.getTag().equalsIgnoreCase("t2c:aresp")) { + + if (!(event.getSender() instanceof Server)) { + ProxyServer.getInstance().getConsole().sendMessage("§c[Security] Blocked unauthorized plugin message from a player ("+ event.getSender().toString() +")!"); + return; + } + DataInputStream stream = new DataInputStream(new ByteArrayInputStream(event.getData())); event.setCancelled(true); try { diff --git a/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/opSecurity/T2CapiOpSecurity.java b/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/opSecurity/T2CapiOpSecurity.java index c30b657..ac58a26 100644 --- a/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/opSecurity/T2CapiOpSecurity.java +++ b/src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/opSecurity/T2CapiOpSecurity.java @@ -1,6 +1,7 @@ package net.t2code.t2codelib.BUNGEE.system.pluginMessaging.opSecurity; import net.md_5.bungee.api.ProxyServer; +import net.md_5.bungee.api.connection.Server; import net.md_5.bungee.api.event.PluginMessageEvent; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; @@ -13,6 +14,12 @@ public class T2CapiOpSecurity implements Listener { @EventHandler public void onPluginmessage(PluginMessageEvent event) { if (event.getTag().equalsIgnoreCase("t2c:opsec")) { + + if (!(event.getSender() instanceof Server)) { + ProxyServer.getInstance().getConsole().sendMessage("§c[Security] Blocked unauthorized plugin message from a player ("+ event.getSender().toString() +")!"); + return; + } + event.setCancelled(true); DataInputStream stream = new DataInputStream(new ByteArrayInputStream(event.getData())); try {