diff options
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 12 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 5 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.h | 1 |
3 files changed, 16 insertions, 2 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index db28b515d04..4713ce9034d 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -2523,8 +2523,16 @@ void GameObject::SetLootState(LootState state, Unit* unit) AI()->OnLootStateChanged(state, unit); // Start restock timer if the chest is partially looted or not looted at all - if (GetGoType() == GAMEOBJECT_TYPE_CHEST && state == GO_ACTIVATED && GetGOInfo()->chest.chestRestockTime > 0 && m_restockTime == 0) - m_restockTime = GameTime::GetGameTime() + GetGOInfo()->chest.chestRestockTime; + if (GetGoType() == GAMEOBJECT_TYPE_CHEST && state == GO_ACTIVATED) + { + GameObjectTemplate const* goInfo = GetGOInfo(); + if (goInfo->chest.chestRestockTime > 0 && m_restockTime == 0) + m_restockTime = GameTime::GetGameTime() + goInfo->chest.chestRestockTime; + + // If world chests were opened, despawn them after 5 minutes + if (goInfo->chest.chestRestockTime == 0 && GetMap()->IsWorldMap()) + DespawnOrUnsummon(5min); + } if (GetGoType() == GAMEOBJECT_TYPE_DOOR) // only set collision for doors on SetGoState return; diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index ecc900b41bd..9ab7f63aabd 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -4226,6 +4226,11 @@ bool Map::Instanceable() const return i_mapEntry && i_mapEntry->Instanceable(); } +bool Map::IsWorldMap() const +{ + return i_mapEntry && i_mapEntry->IsWorldMap(); +} + bool Map::IsDungeon() const { return i_mapEntry && i_mapEntry->IsDungeon(); diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index dfe0ff4a37a..1f8ff20264f 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -419,6 +419,7 @@ class TC_GAME_API Map : public GridRefManager<NGridType> MapDifficulty const* GetMapDifficulty() const; bool Instanceable() const; + bool IsWorldMap() const; bool IsDungeon() const; bool IsNonRaidDungeon() const; bool IsRaid() const; |