fix: fix the container close event [#294]

Author: zimuya4153

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed the container close event [#294] @zimuya4153
+
 ## [0.17.7] - 2026-03-08
 
 ### Changed
@@ -1167,6 +1171,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#278]: https://github.com/LiteLDev/LegacyScriptEngine/issues/278
 [#285]: https://github.com/LiteLDev/LegacyScriptEngine/issues/285
 [#291]: https://github.com/LiteLDev/LegacyScriptEngine/issues/291
+[#294]: https://github.com/LiteLDev/LegacyScriptEngine/issues/294
 [#299]: https://github.com/LiteLDev/LegacyScriptEngine/issues/299
 [#300]: https://github.com/LiteLDev/LegacyScriptEngine/issues/300
 [#303]: https://github.com/LiteLDev/LegacyScriptEngine/issues/303

docs/apis/EventAPI/PlayerEvents.md

@@ -449,9 +449,7 @@ The **container** here is a broad concept of container, including boxes, buckets
     The player that closes the container.
   - block : `Block`  
     The container that was closed.
-- Intercept events: function returns `false`
-
-Due to the limitation of the monitoring function, the containers that currently support monitoring and closing are: chests (`minecraft:chest`), and wooden barrels (`minecraft:barrel`).
+- Intercept event: cannot be intercepted.
 
 
 

docs/apis/EventAPI/PlayerEvents.zh.md

@@ -465,9 +465,7 @@
 
   - block : `Block`  
     被关闭的容器方块对象
-- 拦截事件：函数返回`false`
-
-由于监听函数下限制，目前支持监听关闭的容器有：箱子（`minecraft:chest`）、木桶（`minecraft:barrel`）
+- 拦截事件：不可以拦截
 
 
 

src/lse/events/PlayerEvents.cpp

@@ -21,6 +21,7 @@
 #include "mc/world/actor/player/Inventory.h"
 #include "mc/world/actor/player/Player.h"
 #include "mc/world/actor/player/PlayerInventory.h"
+#include "mc/world/containers/managers/models/ContainerManagerModel.h"
 #include "mc/world/effect/MobEffectInstance.h"
 #include "mc/world/events/BlockEventCoordinator.h"
 #include "mc/world/events/EventResult.h"
@@ -140,51 +141,26 @@ LL_TYPE_INSTANCE_HOOK(
 }
 
 LL_TYPE_INSTANCE_HOOK(
-    CloseContainerHook1,
+    CloseContainerHook,
     HookPriority::Normal,
-    ChestBlockActor,
-    &ChestBlockActor::$stopOpen,
+    ServerPlayer,
+    &ServerPlayer::doDeleteContainerManager,
     void,
-    Actor& actor
+    bool forceDisconnect
 ) {
     IF_LISTENED(EVENT_TYPES::onCloseContainer) {
-        if (checkClientIsServerThread() && actor.isPlayer()) {
-            Player& player = static_cast<Player&>(actor);
-            if (!CallEvent(
-                    EVENT_TYPES::onCloseContainer,
-                    PlayerClass::newPlayer(&player),
-                    BlockClass::newBlock(mPosition, player.getDimensionId().id)
-                )) {
-                return;
-            }
-        }
-    }
-    IF_LISTENED_END(EVENT_TYPES::onCloseContainer);
-    origin(actor);
-}
-
-LL_TYPE_INSTANCE_HOOK(
-    CloseContainerHook2,
-    HookPriority::Normal,
-    BarrelBlockActor,
-    &BarrelBlockActor::$stopOpen,
-    void,
-    Actor& actor
-) {
-    IF_LISTENED(EVENT_TYPES::onCloseContainer) {
-        if (checkClientIsServerThread() && actor.isPlayer()) {
-            Player& player = static_cast<Player&>(actor);
-            if (!CallEvent(
+        if (mContainerManager) {
+            if (auto* pos = std::get_if<BlockPos>(&*mContainerManager->mScreenContext->mOwner); pos) {
+                CallEvent(
                     EVENT_TYPES::onCloseContainer,
-                    PlayerClass::newPlayer(&player),
-                    BlockClass::newBlock(mPosition, player.getDimensionId().id)
-                )) {
-                return;
+                    PlayerClass::newPlayer(this),
+                    BlockClass::newBlock(*pos, getDimensionId().id)
+                );
             }
         }
     }
     IF_LISTENED_END(EVENT_TYPES::onCloseContainer);
-    origin(actor);
+    origin(forceDisconnect);
 }
 
 LL_TYPE_INSTANCE_HOOK(
@@ -659,10 +635,7 @@ void DropItem() {
     DropItemHook2::hook();
 }
 void OpenContainerEvent() { OpenContainerHook::hook(); }
-void CloseContainerEvent() {
-    CloseContainerHook1::hook();
-    CloseContainerHook2::hook();
-}
+void CloseContainerEvent() { CloseContainerHook::hook(); }
 void ChangeSlotEvent() { ChangeSlotHook::hook(); }
 void AttackBlockEvent() { StartDestroyBlockHook::hook(); }
 void UseFrameEvent() {