fix: fix onContainerChange

LiteLDev · Jan 3, 2025 · 109b9cd · VinkyV · Jan 4, 2025 · 109b9cd
1 parent 046923f
commit 109b9cd
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/src/lse/events/EventHooks.cpp b/src/lse/events/EventHooks.cpp
@@ -269,17 +269,20 @@ LL_TYPE_INSTANCE_HOOK(
     ItemStack const& newItem
 ) {
     IF_LISTENED(EVENT_TYPES::onContainerChange) {
-        Player* player = ll::memory::dAccess<Player*>(this, 216); // IDA LevelContainerModel::LevelContainerModel
-        if (player->hasOpenContainer()) {
-            if (!CallEvent(
-                    EVENT_TYPES::onContainerChange,
-                    PlayerClass::newPlayer(player),
-                    BlockClass::newBlock(ll::memory::dAccess<BlockPos>(this, 224), player->getDimensionId()),
-                    Number::newNumber(slotNumber + this->_getContainerOffset()),
-                    ItemClass::newItem(&const_cast<ItemStack&>(oldItem)),
-                    ItemClass::newItem(&const_cast<ItemStack&>(newItem))
-                )) {
-                return;
+        Actor* actor = _getEntity();
+        if (actor && actor->isType(ActorType::Player)) {
+            Player* player = static_cast<Player*>(actor);
+            if (player->hasOpenContainer()) {
+                if (!CallEvent(
+                        EVENT_TYPES::onContainerChange,
+                        PlayerClass::newPlayer(player),
+                        BlockClass::newBlock(ll::memory::dAccess<BlockPos>(this, 224), player->getDimensionId()),
+                        Number::newNumber(slotNumber + this->_getContainerOffset()),
+                        ItemClass::newItem(&const_cast<ItemStack&>(oldItem)),
+                        ItemClass::newItem(&const_cast<ItemStack&>(newItem))
+                    )) {
+                    return;
+                }
             }
         }
     }