From 070d80372f0a6868d02a27175c4eabc8acf02fb0 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 3 Oct 2025 21:01:05 +0200 Subject: Core/Misc: Reduce differences between branches --- src/server/scripts/Commands/cs_gobject.cpp | 5 +---- .../scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 7775ad5b543..8d62192ec5a 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -538,10 +538,7 @@ public: type = gameObjectInfo->type; displayId = gameObjectInfo->displayId; name = gameObjectInfo->name; - if (type == GAMEOBJECT_TYPE_CHEST) - lootId = gameObjectInfo->chest.lootId; - else if (type == GAMEOBJECT_TYPE_FISHINGHOLE) - lootId = gameObjectInfo->fishinghole.lootId; + lootId = gameObjectInfo->GetLootId(); // If we have a real object, send some info about it if (thisGO) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index 56437f61bc0..3a38ad1f01d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -981,7 +981,7 @@ struct go_celestial_planetarium_access : public GameObjectAI return true; bool hasKey = true; - if (LockEntry const* lock = sLockStore.LookupEntry(me->GetGOInfo()->goober.lockId)) + if (LockEntry const* lock = sLockStore.LookupEntry(me->GetGOInfo()->GetLockId())) { hasKey = false; for (uint8 i = 0; i < MAX_LOCK_CASE; ++i) -- cgit v1.2.3