From 47fbbe23bc386bb5d9a5328f9fddbcc9a42e3e5e Mon Sep 17 00:00:00 2001
From: Aust1n46 <aust1n46@yahoo.com>
Date: Thu, 9 Feb 2023 19:09:05 -0600
Subject: [PATCH] Allow ignore bypass for bungeecord messaging (#66)

---
 pom.xml                                           |  2 +-
 .../mineverse/Aust1n46/chat/MineverseChat.java    | 15 +++++++++++++++
 .../Aust1n46/chat/proxy/VentureChatProxy.java     | 12 ++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5172121..5791826 100644
--- 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
index aa4fe53..685d9c5 100644
--- a/src/main/java/mineverse/Aust1n46/chat/MineverseChat.java
+++ b/src/main/java/mineverse/Aust1n46/chat/MineverseChat.java
@@ -605,6 +605,15 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 						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 class MineverseChat extends JavaPlugin implements PluginMessageListener {
 							.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
index 1273537..e9c3e47 100644
--- 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 class VentureChatProxy {
 						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();