From 1f082cb29c6e00aff853a1b1c8ba2244b02e5815 Mon Sep 17 00:00:00 2001 From: Martin Leuner Date: Thu, 5 Jun 2025 17:43:52 +0200 Subject: [PATCH] fix(DB/Creature): Remove extra Shaffar adds (#22255) --- .../pending_db_world/rev_1748707579733807961.sql | 10 ++++++++++ .../Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp | 6 ------ 2 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1748707579733807961.sql diff --git a/data/sql/updates/pending_db_world/rev_1748707579733807961.sql b/data/sql/updates/pending_db_world/rev_1748707579733807961.sql new file mode 100644 index 000000000..e7d93b1e3 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1748707579733807961.sql @@ -0,0 +1,10 @@ +-- Link pre-spawned Ethereal Beacons to Nexus-Prince Shaffar so they respawn on reset +SET @SHAFFAR_GUID := 91162; +SET @AI_FLAGS := 1 | 2 | 8 | 16; + +DELETE FROM `creature_formations` WHERE `leaderGUID` = @SHAFFAR_GUID; +INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES +(@SHAFFAR_GUID, @SHAFFAR_GUID, 0, 0, @AI_FLAGS, 0, 0), +(@SHAFFAR_GUID, 91131, 0, 0, @AI_FLAGS, 0, 0), +(@SHAFFAR_GUID, 91132, 0, 0, @AI_FLAGS, 0, 0), +(@SHAFFAR_GUID, 91133, 0, 0, @AI_FLAGS, 0, 0); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 7066d91b9..dee4e5c7d 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -66,13 +66,7 @@ struct boss_nexusprince_shaffar : public BossAI void Reset() override { _Reset(); - float dist = 8.0f; - float posX, posY, posZ, angle; - me->GetHomePosition(posX, posY, posZ, angle); summons.DespawnAll(); - me->SummonCreature(NPC_BEACON, posX - dist, posY - dist, posZ, angle, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000); - me->SummonCreature(NPC_BEACON, posX - dist, posY + dist, posZ, angle, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000); - me->SummonCreature(NPC_BEACON, posX + dist, posY, posZ, angle, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000); } void MoveInLineOfSight(Unit* who) override