Merge pull request MultiChat#158 from MultiChat/exploit-fix

Exploit fix
ChipWolf · Jan 30, 2021 · 3d52572 · 3d52572
2 parents c321ce7 + a9481f2
commit 3d52572
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 31 deletions.
diff --git a/multichat/dependency-reduced-pom.xml b/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>

diff --git a/multichat/pom.xml b/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>

diff --git a/multichat/releases/1.9.5/multichat-1.9.6.jar b/multichat/releases/1.9.5/multichat-1.9.6.jar
diff --git a/multichat/src/main/java/xyz/olivermartin/multichat/bungee/BungeeComm.java b/multichat/src/main/java/xyz/olivermartin/multichat/bungee/BungeeComm.java
@@ -179,23 +179,15 @@ public static void sendPlayerChannelMessage(String playerName, String channel, C
 	}
 
 	@EventHandler
-	public static 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")) ) {
+	public void onPluginMessage(PluginMessageEvent ev) {
+		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);

diff --git a/multichat/src/main/java/xyz/olivermartin/multichat/bungee/MultiChat.java b/multichat/src/main/java/xyz/olivermartin/multichat/bungee/MultiChat.java
@@ -37,11 +37,12 @@
  */
 public class MultiChat extends Plugin implements Listener {
 
-	public static final String LATEST_VERSION = "1.9.5";
+	public static final String LATEST_VERSION = "1.9.6";
 
 	public static final String[] ALLOWED_VERSIONS = new String[] {
 
 			LATEST_VERSION,
+			"1.9.5",
 			"1.9.4",
 			"1.9.3",
 			"1.9.2",

diff --git a/...hat/src/main/java/xyz/olivermartin/multichat/local/sponge/MultiChatLocalSpongePlugin.java b/...hat/src/main/java/xyz/olivermartin/multichat/local/sponge/MultiChatLocalSpongePlugin.java
@@ -56,7 +56,7 @@
 import xyz.olivermartin.multichat.local.sponge.listeners.communication.LocalSpongePlayerChannelListener;
 import xyz.olivermartin.multichat.local.sponge.listeners.communication.LocalSpongePlayerMetaListener;
 
-@Plugin(id = "multichat", name = "MultiChat", version = "1.9.5", dependencies = { @Dependency(id = "placeholderapi", optional = true) })
+@Plugin(id = "multichat", name = "MultiChat", version = "1.9.6", dependencies = { @Dependency(id = "placeholderapi", optional = true) })
 public class MultiChatLocalSpongePlugin {
 
 	@Inject

diff --git a/multichat/src/main/resources/bungee.yml b/multichat/src/main/resources/bungee.yml
@@ -1,6 +1,6 @@
 name: MultiChat
 main: xyz.olivermartin.multichat.bungee.MultiChat
-version: 1.9.5
+version: 1.9.6
 author: Revilo410
 api-version: 1.16
 softdepends: [PremiumVanish]
diff --git a/multichat/src/main/resources/chatcontrol.yml b/multichat/src/main/resources/chatcontrol.yml
@@ -8,7 +8,7 @@
 
 ##################
 #   DON'T EDIT   #
-version: "1.9.5" #
+version: "1.9.6" #
 ##################
 
 # 1. Chat Control Rules

diff --git a/multichat/src/main/resources/chatcontrol_fr.yml b/multichat/src/main/resources/chatcontrol_fr.yml
@@ -8,7 +8,7 @@
 
 ##################
 # NE PAS EDITER  #
-version: "1.9.5" #
+version: "1.9.6" #
 ##################
 
 # French Translation by Nogapra - Thank you !

diff --git a/multichat/src/main/resources/config.yml b/multichat/src/main/resources/config.yml
@@ -8,7 +8,7 @@
 
 ##################
 #   DON'T EDIT   #
-version: "1.9.5" #
+version: "1.9.6" #
 ##################
 
 # 1. General

diff --git a/multichat/src/main/resources/config_fr.yml b/multichat/src/main/resources/config_fr.yml
@@ -8,7 +8,7 @@
 
 ##################
 # NE PAS EDITER  #
-version: "1.9.5" #
+version: "1.9.6" #
 ##################
 
 # French Translation by Nogapra - Thank you !

diff --git a/multichat/src/main/resources/joinmessages.yml b/multichat/src/main/resources/joinmessages.yml
@@ -8,7 +8,7 @@
 
 ##################
 #   DON'T EDIT   #
-version: "1.9.5" #
+version: "1.9.6" #
 ##################
 
 ############################################################

diff --git a/multichat/src/main/resources/joinmessages_fr.yml b/multichat/src/main/resources/joinmessages_fr.yml
@@ -8,7 +8,7 @@
 
 ##################
 # Ne pas éditer  #
-version: "1.9.5" #
+version: "1.9.6" #
 ##################
 
 # French Translation by Nogapra - Thank you!

diff --git a/multichat/src/main/resources/localconfig.yml b/multichat/src/main/resources/localconfig.yml
@@ -8,7 +8,7 @@
 
 ##################
 #   DON'T EDIT   #
-version: "1.9.5" #
+version: "1.9.6" #
 ##################
 
 # 1. Global Chat Settings

diff --git a/multichat/src/main/resources/localconfig_fr.yml b/multichat/src/main/resources/localconfig_fr.yml
@@ -8,7 +8,7 @@
 
 ##################
 # NE PAS EDITER  #
-version: "1.9.5" #
+version: "1.9.6" #
 ##################
 
 # French Translation by Nogapra - Thank you !

diff --git a/multichat/src/main/resources/messages.yml b/multichat/src/main/resources/messages.yml
@@ -8,7 +8,7 @@
 
 ##################
 #   DON'T EDIT   #
-version: "1.9.5" #
+version: "1.9.6" #
 ##################
 
 ############################################################

diff --git a/multichat/src/main/resources/messages_fr.yml b/multichat/src/main/resources/messages_fr.yml
@@ -8,7 +8,7 @@
 
 ##################
 #   DON'T EDIT   #
-version: "1.9.5" #
+version: "1.9.6" #
 ##################
 
 # French Translation by Nogapra - Thank you!

diff --git a/multichat/src/main/resources/plugin.yml b/multichat/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: MultiChat
-version: 1.9.5
+version: 1.9.6
 author: Revilo410
 main: xyz.olivermartin.multichat.local.spigot.MultiChatLocalSpigotPlugin
 softdepend: [Vault,PlaceholderAPI]