Always close tick future when closing peer

CloudburstMC · Jun 12, 2023 · 76a8533 · 76a8533
1 parent 9b01c3a
commit 76a8533
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/bedrock-connection/src/main/java/org/cloudburstmc/protocol/bedrock/BedrockPeer.java b/bedrock-connection/src/main/java/org/cloudburstmc/protocol/bedrock/BedrockPeer.java
@@ -81,6 +81,10 @@ protected void removeSession(BedrockSession session) {
     }
 
     protected void onTick() {
+        if (this.closed.get()) {
+            return;
+        }
+
         if (!this.packetQueue.isEmpty()) {
             BedrockPacketWrapper packet;
             while ((packet = this.packetQueue.poll()) != null) {
@@ -190,10 +194,20 @@ public void close(String reason) {
     }
 
     protected void onClose() {
-        if (this.channel.isOpen() || !this.closed.compareAndSet(false, true)) {
+        if (this.channel.isOpen()) {
+            log.warn("Tried to close peer, but channel is open!", new Throwable());
             return;
         }
 
+        if (!this.closed.compareAndSet(false, true)) {
+            return;
+        }
+
+        if (this.tickFuture != null) {
+            this.tickFuture.cancel(false);
+            this.tickFuture = null;
+        }
+
         for (BedrockSession session : this.sessions.values())
             try {
                 session.onClose();
@@ -237,10 +251,6 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
 
     @Override
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-        if (this.tickFuture != null) {
-            this.tickFuture.cancel(false);
-            this.tickFuture = null;
-        }
         this.onClose();
     }