fix: close all containers when left the game

AllayMC · Apr 4, 2024 · 02c8833 · 02c8833
1 parent 7deccaf
commit 02c8833
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Allay-API/src/main/java/org/allaymc/api/container/ContainerViewer.java b/Allay-API/src/main/java/org/allaymc/api/container/ContainerViewer.java
@@ -38,4 +38,8 @@ public interface ContainerViewer {
 
     @UnmodifiableView
     BiMap<FullContainerType<?>, Container> getTypeToContainer();
+
+    default void closeAllContainers() {
+        getIdToContainer().forEach(this::onClose);
+    }
 }
diff --git a/...ain/java/org/allaymc/server/entity/component/player/EntityPlayerNetworkComponentImpl.java b/...ain/java/org/allaymc/server/entity/component/player/EntityPlayerNetworkComponentImpl.java
@@ -4,6 +4,7 @@
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.allaymc.api.block.registry.BlockTypeRegistry;
+import org.allaymc.api.entity.component.player.EntityPlayerContainerHolderComponent;
 import org.allaymc.api.utils.Identifier;
 import org.allaymc.api.client.data.LoginData;
 import org.allaymc.api.client.storage.PlayerData;
@@ -126,10 +127,15 @@ public void handleDisconnect() {
             // Especially for cheater, the BedrockPacketHandler::onDisconnect() method may won't be called
             // If we call server.onDisconnect() in BedrockPacketHandler::onDisconnect(),
             // cheaters will be able to create a lot of fake clients and make the server OOM
+            onDisconnect();
             server.onDisconnect(player, disconnectReason);
         }
     }
 
+    protected void onDisconnect() {
+        player.closeAllContainers();
+    }
+
     @Override
     public boolean shouldHandleDisconnect() {
         return !disconnected && disconnectReason != null;