aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 9fc455bdf8e..11bdf7b759b 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -639,6 +639,7 @@ void GameObject::Update(uint32 diff)
if (m_restockTime > GameTime::GetGameTime())
return;
// If there is no restock timer, or if the restock timer passed, the chest becomes ready to loot
+ m_restockTime = 0;
m_lootState = GO_READY;
AddToObjectUpdateIfNeeded();
break;
@@ -828,9 +829,10 @@ void GameObject::Update(uint32 diff)
m_groupLootTimer -= diff;
}
- // Gameobject was partially looted and restock time passed, restock all loot now
- if (GameTime::GetGameTime() >= m_restockTime)
+ // Non-consumable chest was partially looted and restock time passed, restock all loot now
+ if (GetGOInfo()->chest.consumable == 0 && GameTime::GetGameTime() >= m_restockTime)
{
+ m_restockTime = 0;
m_lootState = GO_READY;
AddToObjectUpdateIfNeeded();
}