Merge 3.3.5-base_patch to 3.3.5-passive_anticheat

Github Actions · Github Actions · commit f3aaaf06eca2 · 2025-08-18T02:06:20.000Z
diff --git a/dep/boost/CMakeLists.txt b/dep/boost/CMakeLists.txt
@@ -43,7 +43,6 @@ endif()
 find_package(Boost ${BOOST_REQUIRED_VERSION}
   REQUIRED
   COMPONENTS 
-    system
     filesystem
     program_options
     regex
diff --git a/sql/updates/world/3.3.5/2025_08_16_00_world.sql b/sql/updates/world/3.3.5/2025_08_16_00_world.sql
@@ -0,0 +1,17 @@
+--
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_kurinnaxx_sand_trap';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(26524, 'spell_kurinnaxx_sand_trap');
+
+-- Should be disturbed instead (activate object action)
+UPDATE `gameobject_template` SET `AIName` = 'SmartGameObjectAI' WHERE `entry` = 180647;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 180647 AND `source_type` = 1;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(180647,1,0,0,60,0,100,1,4500,4500,0,0,0,11,25656,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Sand Trap - On Update - Cast 'Sand Trap' (No Repeat)"),
+(180647,1,1,0,60,0,100,1,4500,4500,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Sand Trap - On Update - Despawn (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 15348;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(15348,0,0,"%s goes into a frenzy!",16,0,100,0,0,0,2384,0,"Kurinnaxx EMOTE_FRENZY");
+
+UPDATE `creature_text` SET `TextRange` = 3 WHERE `CreatureID` = 15339 AND `GroupID` = 5;
diff --git a/sql/updates/world/3.3.5/2025_08_16_01_world.sql b/sql/updates/world/3.3.5/2025_08_16_01_world.sql
@@ -0,0 +1,32 @@
+--
+DELETE FROM `spell_target_position` WHERE `ID` IN (518,25831,25832,26630,26631,26632,720,731,1121);
+INSERT INTO `spell_target_position` (`ID`, `EffectIndex`, `MapID`, `PositionX`, `PositionY`, `PositionZ`, `Orientation`, `VerifiedBuild`) VALUES
+(518,0,531,-8028.5,1050.9,-54,0,0),
+(25831,0,531,-8158.03,1139.3,-83.95,0,0),
+(25832,0,531,-8029.25,1237.78,-85.2285,0,0),
+(720,0,531,-8043.6,1254.1,-84.3,0,0),
+(731,0,531,-8003,1222.9,-82.1,0,0),
+(1121,0,531,-8022.3,1149,-89.1,0,0),
+(26630,0,531,-8043.6,1254.1,-84.2167,0,0),
+(26631,0,531,-8003,1222.9,-82.0167,0,0),
+(26632,0,531,-8022.3,1149,-89.0167,0,0);
+
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 15962;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (15630,15962) AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(15630,0,0,0,37,0,100,0,0,0,0,0,0,116,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Spawn of Fankriss - On AI Initialize - Set Corpse Delay"),
+(15630,0,1,0,11,0,100,0,0,0,0,0,0,38,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Spawn of Fankriss - On Spawn - Set In Combat With Zone"),
+(15630,0,2,0,60,0,100,1,20000,20000,0,0,0,11,26662,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Spawn of Fankriss - On Update - Cast 'Berserk'"),
+
+(15962,0,0,0,37,0,100,0,0,0,0,0,0,116,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Vekniss Hatchling - On AI Initialize - Set Corpse Delay"),
+(15962,0,1,0,11,0,100,0,0,0,0,0,0,38,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Vekniss Hatchling - On Spawn - Set In Combat With Zone");
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_fankriss_entangle';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(720, 'spell_fankriss_entangle'),
+(731, 'spell_fankriss_entangle'),
+(1121, 'spell_fankriss_entangle');
+
+UPDATE `creature_template` SET `speed_run` = 2.14285714286 WHERE `entry` = 15510;
+UPDATE `creature_template` SET `speed_run` = 1.71428571429 WHERE `entry` = 15630;
+UPDATE `creature_template` SET `speed_run` = 1.42857142857 WHERE `entry` = 15962;
diff --git a/sql/updates/world/3.3.5/2025_08_16_02_world.sql b/sql/updates/world/3.3.5/2025_08_16_02_world.sql
@@ -0,0 +1,16 @@
+--
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` IN (22035,22036);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (22035,22036) AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2203500) AND `source_type` = 9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(22035,0,0,0,37,0,100,0,0,0,0,0,0,116,4,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pure Spawn of Hydross - On AI Initialize - Set Corpse Delay"),
+(22035,0,1,0,37,0,100,0,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pure Spawn of Hydross - On AI Initialize - Set Reactstate Passive"),
+(22035,0,2,0,11,0,100,0,0,0,0,0,0,11,25035,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pure Spawn of Hydross - On Spawn - Cast 'Elemental Spawn-in'"),
+(22035,0,3,0,11,0,100,0,0,0,0,0,0,80,2203500,2,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pure Spawn of Hydross - On Spawn - Run Script"),
+
+(22036,0,0,0,37,0,100,0,0,0,0,0,0,116,4,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tainted Spawn of Hydross - On AI Initialize - Set Corpse Delay"),
+(22036,0,1,0,37,0,100,0,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tainted Spawn of Hydross - On AI Initialize - Set Reactstate Passive"),
+(22036,0,2,0,11,0,100,0,0,0,0,0,0,11,25035,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tainted Spawn of Hydross - On Spawn - Cast 'Elemental Spawn-in'"),
+(22036,0,3,0,11,0,100,0,0,0,0,0,0,80,2203500,2,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tainted Spawn of Hydross - On Spawn - Run Script"),
+
+(2203500,9,0,0,0,0,100,0,3000,3000,0,0,0,8,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pure Spawn of Hydross - On Script - Set Reactstate Aggressive");
diff --git a/sql/updates/world/3.3.5/2025_08_17_00_world.sql b/sql/updates/world/3.3.5/2025_08_17_00_world.sql
@@ -0,0 +1,17 @@
+--
+UPDATE `spell_script_names` SET `ScriptName` = 'spell_netherstorm_detonate_teleporter' WHERE `ScriptName` = 'spell_detonate_teleporter';
+
+-- Shouldn't be used for teleport, only to trigger events
+DELETE FROM `areatrigger_teleport` WHERE `ID` = 4523;
+
+DELETE FROM `gameobject` WHERE `guid` = 91320 AND `id` = 184606;
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `StringId`, `VerifiedBuild`) VALUES
+(91320,184606,530,0,0,1,1,4799.248,3779.397,211.75,0,0,0,0,1,300,0,1,'',NULL,0);
+
+UPDATE `spell_script_names` SET `ScriptName` = 'spell_netherstorm_socrethars_stone' WHERE `ScriptName` = 'spell_item_socrethars_stone';
+
+--
+UPDATE `spell_script_names` SET `ScriptName` = 'spell_hellfire_peninsula_purify_helboar_meat' WHERE `ScriptName` = 'spell_item_purify_helboar_meat';
+
+--
+UPDATE `spell_script_names` SET `ScriptName` = 'spell_hellfire_peninsula_absorb_eye_of_grillok' WHERE `ScriptName` = 'spell_item_absorb_eye_of_grillok';
diff --git a/src/common/Containers/FlatSet.h b/src/common/Containers/FlatSet.h
@@ -17,6 +17,7 @@
 #ifndef TRINITYCORE_FLAT_SET_H
 #define TRINITYCORE_FLAT_SET_H
 
+#include <algorithm>
 #include <functional>
 #include <vector>
 
@@ -38,21 +39,28 @@ class FlatSet
     auto end()  { return _storage.end(); }
     auto end() const { return _storage.end(); }
 
+    bool contains(Key const& value) const
+    {
+        return std::binary_search(this->begin(), this->end(), value, Compare());
+    }
+
     auto find(Key const& value) const
     {
+        auto compare = Compare();
         auto end = this->end();
-        auto itr = std::lower_bound(this->begin(), end, value, Compare());
-        if (itr != end && Compare()(value, *itr))
+        auto itr = std::lower_bound(this->begin(), end, value, compare);
+        if (itr != end && compare(value, *itr))
             itr = end;
 
         return itr;
     }
 
     auto find(Key const& value)
     {
+        auto compare = Compare();
         auto end = this->end();
-        auto itr = std::lower_bound(this->begin(), end, value, Compare());
-        if (itr != end && Compare()(value, *itr))
+        auto itr = std::lower_bound(this->begin(), end, value, compare);
+        if (itr != end && compare(value, *itr))
             itr = end;
 
         return itr;
@@ -62,9 +70,10 @@ class FlatSet
     std::pair<iterator, bool> emplace(Args&&... args)
     {
         Key newElement(std::forward<Args>(args)...);
+        auto compare = Compare();
         auto end = this->end();
-        auto itr = std::lower_bound(this->begin(), end, newElement, Compare());
-        if (itr != end && !Compare()(newElement, *itr))
+        auto itr = std::lower_bound(this->begin(), end, newElement, compare);
+        if (itr != end && !compare(newElement, *itr))
             return { itr, false };
 
         return { _storage.emplace(itr, std::move(newElement)), true };
@@ -87,15 +96,8 @@ class FlatSet
 
     void shrink_to_fit() { _storage.shrink_to_fit(); }
 
-    friend bool operator==(FlatSet const& left, FlatSet const& right)
-    {
-        return left._storage == right._storage;
-    }
-
-    friend bool operator!=(FlatSet const& left, FlatSet const& right)
-    {
-        return !(left == right);
-    }
+    friend std::strong_ordering operator<=>(FlatSet const& left, FlatSet const& right) = default;
+    friend bool operator==(FlatSet const& left, FlatSet const& right) = default;
 
 private:
     KeyContainer _storage;
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
@@ -1795,7 +1795,7 @@ void Battleground::SetBgRaid(uint32 TeamID, Group* bg_raid)
 
 WorldSafeLocsEntry const* Battleground::GetClosestGraveyard(Player* player)
 {
-    return sObjectMgr->GetClosestGraveyard(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), player->GetTeam());
+    return sObjectMgr->GetClosestGraveyard(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), player->GetTeam(), player);
 }
 
 void Battleground::StartTimedAchievement(AchievementCriteriaTimedTypes type, uint32 entry)
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
@@ -4882,7 +4882,7 @@ void Player::RepopAtGraveyard()
         if (Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(GetZoneId()))
             ClosestGrave = bf->GetClosestGraveyard(this);
         else
-            ClosestGrave = sObjectMgr->GetClosestGraveyard(GetPositionX(), GetPositionY(), GetPositionZ(), GetMapId(), GetTeam());
+            ClosestGrave = sObjectMgr->GetClosestGraveyard(GetPositionX(), GetPositionY(), GetPositionZ(), GetMapId(), GetTeam(), this);
     }
 
     // stop countdown until repop
@@ -22110,7 +22110,7 @@ void Player::SetBattlegroundEntryPoint()
         // If map is dungeon find linked graveyard
         if (GetMap()->IsDungeon())
         {
-            if (WorldSafeLocsEntry const* entry = sObjectMgr->GetClosestGraveyard(GetPositionX(), GetPositionY(), GetPositionZ(), GetMapId(), GetTeam()))
+            if (WorldSafeLocsEntry const* entry = sObjectMgr->GetClosestGraveyard(GetPositionX(), GetPositionY(), GetPositionZ(), GetMapId(), GetTeam(), this))
                 m_bgData.joinPos = WorldLocation(entry->Continent, entry->Loc.X, entry->Loc.Y, entry->Loc.Z, 0.0f);
             else
                 TC_LOG_ERROR("entities.player", "Player::SetBattlegroundEntryPoint: Dungeon (MapID: {}) has no linked graveyard, setting home location as entry point.", GetMapId());
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
@@ -7019,7 +7019,7 @@ WorldSafeLocsEntry const* ObjectMgr::GetDefaultGraveyard(uint32 team) const
     else return nullptr;
 }
 
-WorldSafeLocsEntry const* ObjectMgr::GetClosestGraveyard(float x, float y, float z, uint32 MapId, uint32 team) const
+WorldSafeLocsEntry const* ObjectMgr::GetClosestGraveyard(float x, float y, float z, uint32 MapId, uint32 team, WorldObject* conditionObject) const
 {
     // search for zone associated closest graveyard
     uint32 zoneId = sMapMgr->GetZoneId(PHASEMASK_NORMAL, MapId, x, y, z);
@@ -7028,7 +7028,8 @@ WorldSafeLocsEntry const* ObjectMgr::GetClosestGraveyard(float x, float y, float
     {
         if (z > -500)
         {
-            TC_LOG_ERROR("misc", "ZoneId not found for map {} coords ({}, {}, {})", MapId, x, y, z);
+            TC_LOG_ERROR("misc", "ZoneId not found for map {} coords ({}, {}, {}), object name: {} {}", MapId, x, y, z,
+                conditionObject ? std::string_view(conditionObject->GetName()) : "", Object::GetGUID(conditionObject));
             return GetDefaultGraveyard(team);
         }
     }
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
@@ -1059,7 +1059,7 @@ class TC_GAME_API ObjectMgr
         QuestGreeting const* GetQuestGreeting(ObjectGuid guid) const;
 
         WorldSafeLocsEntry const* GetDefaultGraveyard(uint32 team) const;
-        WorldSafeLocsEntry const* GetClosestGraveyard(float x, float y, float z, uint32 MapId, uint32 team) const;
+        WorldSafeLocsEntry const* GetClosestGraveyard(float x, float y, float z, uint32 MapId, uint32 team, WorldObject* conditionObject) const;
         bool AddGraveyardLink(uint32 id, uint32 zoneId, uint32 team, bool persist = true);
         void RemoveGraveyardLink(uint32 id, uint32 zoneId, uint32 team, bool persist = false);
         void LoadGraveyardZones();
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
@@ -2241,7 +2241,7 @@ void Group::ResetInstances(uint8 method, bool isRaid, Player* SendMsgTo)
                         TC_LOG_DEBUG("root", "Instance entrance not found for maps {}", map->GetId());
                     else
                     {
-                        WorldSafeLocsEntry const * graveyardLocation = sObjectMgr->GetClosestGraveyard(instanceEntrance->target_X, instanceEntrance->target_Y, instanceEntrance->target_Z, instanceEntrance->target_mapId, SendMsgTo->GetTeam());
+                        WorldSafeLocsEntry const * graveyardLocation = sObjectMgr->GetClosestGraveyard(instanceEntrance->target_X, instanceEntrance->target_Y, instanceEntrance->target_Z, instanceEntrance->target_mapId, SendMsgTo->GetTeam(), SendMsgTo);
                         uint32 const zoneId = sMapMgr->GetZoneId(PHASEMASK_NORMAL, graveyardLocation->Continent, graveyardLocation->Loc.X, graveyardLocation->Loc.Y, graveyardLocation->Loc.Z);
 
                         for (MemberSlot const& member : GetMemberSlots())
diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp
@@ -222,7 +222,7 @@ void WorldSession::SendSpiritResurrect()
     {
         WorldLocation const& corpseLocation = _player->GetCorpseLocation();
         corpseGrave = sObjectMgr->GetClosestGraveyard(corpseLocation.GetPositionX(), corpseLocation.GetPositionY(),
-            corpseLocation.GetPositionZ(), corpseLocation.GetMapId(), _player->GetTeam());
+            corpseLocation.GetPositionZ(), corpseLocation.GetMapId(), _player->GetTeam(), _player);
     }
 
     // now can spawn bones
@@ -232,7 +232,7 @@ void WorldSession::SendSpiritResurrect()
     if (corpseGrave)
     {
         WorldSafeLocsEntry const* ghostGrave = sObjectMgr->GetClosestGraveyard(
-            _player->GetPositionX(), _player->GetPositionY(), _player->GetPositionZ(), _player->GetMapId(), _player->GetTeam());
+            _player->GetPositionX(), _player->GetPositionY(), _player->GetPositionZ(), _player->GetMapId(), _player->GetTeam(), _player);
 
         if (corpseGrave != ghostGrave)
             _player->TeleportTo(corpseGrave->Continent, corpseGrave->Loc.X, corpseGrave->Loc.Y, corpseGrave->Loc.Z, _player->GetOrientation());
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
@@ -3173,7 +3173,9 @@ void SpellMgr::LoadSpellInfoCorrections()
     ApplySpellFix({
         42818, // Headless Horseman - Wisp Flight Port
         42821, // Headless Horseman - Wisp Flight Missile
-        17678  // Despawn Spectral Combatants
+        17678, // Despawn Spectral Combatants
+        720,   // Entangle
+        731    // Entangle
     }, [](SpellInfo* spellInfo)
     {
         spellInfo->RangeEntry = sSpellRangeStore.LookupEntry(6); // 100 yards
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
@@ -1534,7 +1534,7 @@ class debug_commandscript : public CommandScript
                 if (Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(player->GetZoneId()))
                     nearestLoc = bf->GetClosestGraveyard(player);
                 else
-                    nearestLoc = sObjectMgr->GetClosestGraveyard(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), player->GetTeam());
+                    nearestLoc = sObjectMgr->GetClosestGraveyard(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), player->GetTeam(), player);
             }
         }
         else
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
@@ -1043,7 +1043,7 @@ class misc_commandscript : public CommandScript
         Player* player = handler->GetSession()->GetPlayer();
         uint32 zone_id = player->GetZoneId();
 
-        WorldSafeLocsEntry const* graveyard = sObjectMgr->GetClosestGraveyard(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), team);
+        WorldSafeLocsEntry const* graveyard = sObjectMgr->GetClosestGraveyard(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), team, nullptr);
         if (graveyard)
         {
             uint32 graveyardId = graveyard->ID;
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp

Original file line number	Diff line number	Diff line change
`@@ -1795,7 +1795,7 @@ void Battleground::SetBgRaid(uint32 TeamID, Group* bg_raid)`
`1795`	`1795`
`1796`	`1796`	`WorldSafeLocsEntry const* Battleground::GetClosestGraveyard(Player* player)`
`1797`	`1797`	`{`
`1798`		`- return sObjectMgr->GetClosestGraveyard(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), player->GetTeam());`
	`1798`	`+ return sObjectMgr->GetClosestGraveyard(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), player->GetTeam(), player);`
`1799`	`1799`	`}`
`1800`	`1800`
`1801`	`1801`	`void Battleground::StartTimedAchievement(AchievementCriteriaTimedTypes type, uint32 entry)`
Original file line number	Diff line number	Diff line change
`@@ -7019,7 +7019,7 @@ WorldSafeLocsEntry const* ObjectMgr::GetDefaultGraveyard(uint32 team) const`
`7019`	`7019`	`else return nullptr;`
`7020`	`7020`	`}`
`7021`	`7021`
`7022`		`-WorldSafeLocsEntry const* ObjectMgr::GetClosestGraveyard(float x, float y, float z, uint32 MapId, uint32 team) const`
	`7022`	`+WorldSafeLocsEntry const* ObjectMgr::GetClosestGraveyard(float x, float y, float z, uint32 MapId, uint32 team, WorldObject* conditionObject) const`
`7023`	`7023`	`{`
`7024`	`7024`	`// search for zone associated closest graveyard`
`7025`	`7025`	`uint32 zoneId = sMapMgr->GetZoneId(PHASEMASK_NORMAL, MapId, x, y, z);`
`@@ -7028,7 +7028,8 @@ WorldSafeLocsEntry const* ObjectMgr::GetClosestGraveyard(float x, float y, float`
`7028`	`7028`	`{`
`7029`	`7029`	`if (z > -500)`
`7030`	`7030`	`{`
`7031`		`- TC_LOG_ERROR("misc", "ZoneId not found for map {} coords ({}, {}, {})", MapId, x, y, z);`
	`7031`	`+ TC_LOG_ERROR("misc", "ZoneId not found for map {} coords ({}, {}, {}), object name: {} {}", MapId, x, y, z,`
	`7032`	`+ conditionObject ? std::string_view(conditionObject->GetName()) : "", Object::GetGUID(conditionObject));`
`7032`	`7033`	`return GetDefaultGraveyard(team);`
`7033`	`7034`	`}`
`7034`	`7035`	`}`