Allow ignore bypass for bungeecord messaging (#66)

Aust1n46 · Feb 10, 2023 · 47fbbe2 · 47fbbe2
1 parent 314fe96
commit 47fbbe2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>mineverse.Aust1n46.chat</groupId>
     <artifactId>VentureChat</artifactId>
-    <version>3.4.6</version>
+    <version>3.5.0</version>
     <url>https://bitbucket.org/Aust1n46/venturechat/src/master</url>
     <scm>
         <url>https://bitbucket.org/Aust1n46/venturechat/src/master</url>

diff --git a/src/main/java/mineverse/Aust1n46/chat/MineverseChat.java b/src/main/java/mineverse/Aust1n46/chat/MineverseChat.java
@@ -605,6 +605,15 @@ public void run() {
 						sendPluginMessage(stream);
 						return;
 					}
+					if (p.getPlayer().hasPermission("venturechat.ignore.bypass")) {
+						out.writeUTF("Ignore");
+						out.writeUTF("Bypass");
+						out.writeUTF(server);
+						out.writeUTF(receiver);
+						out.writeUTF(sender.toString());
+						sendPluginMessage(stream);
+						return;
+					}
 					out.writeUTF("Ignore");
 					out.writeUTF("Echo");
 					out.writeUTF(server);
@@ -640,6 +649,12 @@ public void run() {
 							.replace("{player}", receiverName));
 					synchronize(p, true);
 				}
+				if(identifier.equals("Bypass")) {
+					String receiver = msgin.readUTF();
+					UUID sender = UUID.fromString(msgin.readUTF());
+					MineverseChatPlayer p = MineverseChatAPI.getOnlineMineverseChatPlayer(sender);
+					p.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_CANT.toString().replace("{player}", receiver));
+				}
 			}
 			if(subchannel.equals("Mute")) {
 				String identifier = msgin.readUTF();

diff --git a/src/main/java/mineverse/Aust1n46/chat/proxy/VentureChatProxy.java b/src/main/java/mineverse/Aust1n46/chat/proxy/VentureChatProxy.java
@@ -205,6 +205,18 @@ public static void onPluginMessage(byte[] data, String serverName, VentureChatPr
 						source.sendPluginMessage(server, outstream.toByteArray());
 					}
 				}
+				if(identifier.equals("Bypass")) {
+					String server = in.readUTF();
+					String player = in.readUTF();
+					String sender = in.readUTF();
+					out.writeUTF("Ignore");
+					out.writeUTF("Bypass");
+					out.writeUTF(player);
+					out.writeUTF(sender);
+					if(!source.getServer(server).isEmpty()) {
+						source.sendPluginMessage(server, outstream.toByteArray());
+					}
+				}
 			}
 			if(subchannel.equals("Mute")) {
 				String identifier = in.readUTF();