From 2c5cb29ad49063b7b0e4085f8624ab32786d382d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Borz=C3=AC?= Date: Wed, 21 Apr 2021 10:32:32 +0200 Subject: [PATCH] Revert "fix(Core): fix chests not despawning when opened in group (#5371)" (#5386) This reverts commit cd6ee1c644b5a4f6f5462d15f261c822d90aac47. --- src/server/game/Entities/GameObject/GameObject.cpp | 1 - src/server/game/Groups/Group.cpp | 9 --------- src/server/game/Loot/LootMgr.h | 2 -- 3 files changed, 12 deletions(-) diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 5d19bce37..74a1ff170 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -60,7 +60,6 @@ GameObject::GameObject() : WorldObject(false), MovableMapObject(), m_lootGenerationTime = 0; ResetLootMode(); // restore default loot mode - loot.sourceGameObject = this; m_stationaryPosition.Relocate(0.0f, 0.0f, 0.0f, 0.0f); } diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 215cb3c5f..f9ef31010 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -1494,15 +1494,6 @@ void Group::CountTheRoll(Rolls::iterator rollI, Map* allowedMap) item->is_blocked = false; } - { - Loot* loot = roll->getLoot(); - if (loot->isLooted() && loot->sourceGameObject != nullptr && loot->sourceGameObject->GetGOInfo()->type == GAMEOBJECT_TYPE_CHEST) - { - // Deactivate chest if the last item was rolled in group - loot->sourceGameObject->SetLootState(GO_JUST_DEACTIVATED); - } - } - RollId.erase(rollI); delete roll; } diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h index 1c35ba568..878759a66 100644 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -109,7 +109,6 @@ enum LootSlotType class Player; class LootStore; class ConditionMgr; -class GameObject; struct Loot; struct LootStoreItem @@ -312,7 +311,6 @@ struct Loot // GUIDLow of container that holds this loot (item_instance.entry), set for items that can be looted uint32 containerId{0}; - GameObject* sourceGameObject; Loot(uint32 _gold = 0) : gold(_gold) { } ~Loot() { clear(); }