From f2c62cf5c730f11019cecd67716b83d8da58b74a Mon Sep 17 00:00:00 2001
From: catfoolyou <catfoolyou.github@manyme.com>
Date: Mon, 24 Feb 2025 19:00:23 -0500
Subject: [PATCH] More bungeecord shit

---
 .../bungee/eaglercraft/WebSocketListener.java |  6 +++++
 .../bungee/eaglercraft/WebSocketProxy.java    |  3 +--
 .../net/md_5/bungee/netty/ChannelWrapper.java | 27 +++++--------------
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/eaglerbungee/src/main/java/net/md_5/bungee/eaglercraft/WebSocketListener.java b/eaglerbungee/src/main/java/net/md_5/bungee/eaglercraft/WebSocketListener.java
index 0c635b2..e150297 100644
--- a/eaglerbungee/src/main/java/net/md_5/bungee/eaglercraft/WebSocketListener.java
+++ b/eaglerbungee/src/main/java/net/md_5/bungee/eaglercraft/WebSocketListener.java
@@ -177,8 +177,10 @@ public class WebSocketListener extends WebSocketServer {
 
 	@Override
 	public void onMessage(WebSocket arg0, ByteBuffer arg1) {
+		System.out.println("[WebsocketListener] - onMessage called");
 		Object o = arg0.getAttachment();
 		if(o == null || (o instanceof PendingSocket)) {
+			System.out.println("o is null");
 			InetAddress realAddr;
 			if(o == null) {
 				realAddr = arg0.getRemoteSocketAddress().getAddress();
@@ -193,6 +195,7 @@ public class WebSocketListener extends WebSocketServer {
 					}else if(l == RateLimit.NOW_LOCKED_OUT) {
 						arg0.send(createRawKickPacket("LOCKED"));
 					}
+					System.out.println("Socket is closed");
 					arg0.close();
 					return;
 				}
@@ -207,9 +210,12 @@ public class WebSocketListener extends WebSocketServer {
 			o = proxyObj;
 		}
 		if(o != null) {
+			System.out.println("o is not null");
 			if(o instanceof WebSocketProxy) {
+				System.out.println("Instance of WebSocketProxy, sending packet");
 				((WebSocketProxy)o).sendPacket(arg1);
 			}else {
+				System.out.println("Closing websocket");
 				arg0.close();
 			}
 		}
diff --git a/eaglerbungee/src/main/java/net/md_5/bungee/eaglercraft/WebSocketProxy.java b/eaglerbungee/src/main/java/net/md_5/bungee/eaglercraft/WebSocketProxy.java
index 99c50e0..7493f63 100644
--- a/eaglerbungee/src/main/java/net/md_5/bungee/eaglercraft/WebSocketProxy.java
+++ b/eaglerbungee/src/main/java/net/md_5/bungee/eaglercraft/WebSocketProxy.java
@@ -63,9 +63,8 @@ public class WebSocketProxy extends SimpleChannelInboundHandler<ByteBuf> {
 	public boolean connect() {
 		System.out.println("[WebsocketProxy] - connecting (?)");
 		try {
-			System.out.println("trying to connect");
 			if(tcpChannel == null) {
-				System.out.println("tcp channel is null, probly doing websocket shit (I'm too retarded to understand this)");
+				System.out.println("Actually connecting");
 				Bootstrap clientBootstrap = new Bootstrap();
 				clientBootstrap.group(group);
 				clientBootstrap.channel(NioSocketChannel.class);
diff --git a/eaglerbungee/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java b/eaglerbungee/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
index 46fe8d5..85daacc 100644
--- a/eaglerbungee/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
+++ b/eaglerbungee/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
@@ -21,29 +21,16 @@ public class ChannelWrapper
         this.ch = ctx.channel();
     }
 
-    public synchronized void write(Object packet)
-    {
-        if ( !closed )
-        {
-            if ( packet instanceof PacketWrapper )
-            {
-                ( (PacketWrapper) packet ).setReleased( true );
-                ch.write( ( (PacketWrapper) packet ).buf );
-            } else
-            {
-                ch.write( packet );
-            }
-            //ch.flush();
+    public synchronized void write(final Object packet) {
+        if (!this.closed) {
+            this.ch.write(packet);
         }
     }
 
-    public synchronized void close()
-    {
-        if ( !closed )
-        {
-            closed = true;
-            //ch.flush();
-            ch.close();
+    public synchronized void close() {
+        if (!this.closed) {
+            this.closed = true;
+            this.ch.close();
         }
     }