Fix plugin message channel exploit

Author: Deko Ration

multichat/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>xyz.olivermartin.multichat</groupId>
   <artifactId>multichat</artifactId>
-  <version>1.9.5</version>
+  <version>1.9.6</version>
   <build>
     <plugins>
       <plugin>
@@ -148,7 +148,7 @@
     <dependency>
       <groupId>net.md-5</groupId>
       <artifactId>bungeecord-api</artifactId>
-      <version>1.16-R0.2-SNAPSHOT</version>
+      <version>1.16-R0.4-SNAPSHOT</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
@@ -184,7 +184,7 @@
     <dependency>
       <groupId>net.md-5</groupId>
       <artifactId>bungeecord-api</artifactId>
-      <version>1.16-R0.2-SNAPSHOT</version>
+      <version>1.16-R0.4-SNAPSHOT</version>
       <type>javadoc</type>
       <scope>provided</scope>
       <exclusions>

multichat/pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>xyz.olivermartin.multichat</groupId>
 	<artifactId>multichat</artifactId>
-	<version>1.9.5</version>
+	<version>1.9.6</version>
 
 	<repositories>
 
@@ -117,15 +117,15 @@
 		<dependency>
 			<groupId>net.md-5</groupId>
 			<artifactId>bungeecord-api</artifactId>
-			<version>1.16-R0.2-SNAPSHOT</version>
+			<version>1.16-R0.4-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>net.md-5</groupId>
 			<artifactId>bungeecord-api</artifactId>
-			<version>1.16-R0.2-SNAPSHOT</version>
+			<version>1.16-R0.4-SNAPSHOT</version>
 			<type>javadoc</type>
 			<scope>provided</scope>
 		</dependency>

multichat/src/main/java/xyz/olivermartin/multichat/bungee/BungeeComm.java

@@ -180,21 +180,14 @@ public static void sendPlayerChannelMessage(String playerName, String channel, C
 
 	@EventHandler
 	public void onPluginMessage(PluginMessageEvent ev) {
-		if (! (ev.getTag().equals("multichat:comm") || ev.getTag().equals("multichat:chat") || ev.getTag().equals("multichat:prefix") || ev.getTag().equals("multichat:suffix") || ev.getTag().equals("multichat:dn") || ev.getTag().equals("multichat:world") || ev.getTag().equals("multichat:nick") || ev.getTag().equals("multichat:pxe") || ev.getTag().equals("multichat:ppxe")) ) {
+		if (!ev.getTag().startsWith("multichat:"))
 			return;
-		}
 
 		if (!(ev.getSender() instanceof Server)) {
+			ev.setCancelled(true);
 			return;
 		}
 
-		if (ev.getTag().equals("multichat:comm")) {
-
-			// TODO Remove - legacy
-			return;
-
-		}
-
 		if (ev.getTag().equals("multichat:chat")) {
 
 			ev.setCancelled(true);