properly allow other initial packets through

DenizenScript · Dec 2, 2019 · 53304dc · 53304dc
1 parent d2d454d
commit 53304dc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bungee/BungeeBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bungee/BungeeBridge.java
@@ -98,7 +98,7 @@ public void registerPackets() {
     }
 
     public void sendPacket(PacketOut packet) {
-        if (!connected && !(packet instanceof MyInfoPacketOut)) {
+        if (!connected && !packet.canBeFirstPacket) {
             Debug.echoError("BungeeBridge tried to send packet while not connected.");
             return;
         }

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bungee/PacketOut.java b/src/main/java/com/denizenscript/depenizen/bukkit/bungee/PacketOut.java
@@ -5,6 +5,8 @@
 
 public abstract class PacketOut {
 
+    public boolean canBeFirstPacket = false;
+
     public abstract int getPacketId();
 
     public abstract void writeTo(ByteBuf buf);

diff --git a/.../com/denizenscript/depenizen/bukkit/bungee/packets/out/ControlsProxyCommandPacketOut.java b/.../com/denizenscript/depenizen/bukkit/bungee/packets/out/ControlsProxyCommandPacketOut.java
@@ -7,6 +7,7 @@ public class ControlsProxyCommandPacketOut extends PacketOut {
 
     public ControlsProxyCommandPacketOut(boolean control) {
         this.control = control;
+        canBeFirstPacket = true;
     }
 
     public boolean control;

diff --git a/...ava/com/denizenscript/depenizen/bukkit/bungee/packets/out/ControlsProxyPingPacketOut.java b/...ava/com/denizenscript/depenizen/bukkit/bungee/packets/out/ControlsProxyPingPacketOut.java
@@ -7,6 +7,7 @@ public class ControlsProxyPingPacketOut extends PacketOut {
 
     public ControlsProxyPingPacketOut(boolean control) {
         this.control = control;
+        canBeFirstPacket = true;
     }
 
     public boolean control;

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bungee/packets/out/MyInfoPacketOut.java b/src/main/java/com/denizenscript/depenizen/bukkit/bungee/packets/out/MyInfoPacketOut.java
@@ -7,6 +7,7 @@ public class MyInfoPacketOut extends PacketOut {
 
     public MyInfoPacketOut(int port) {
         this.port = port;
+        canBeFirstPacket = true;
     }
 
     public int port;