Skip to content

fix(DB/Creature): Remove extra Shaffar adds #22255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 5, 2025
+10 −6
Merged

fix(DB/Creature): Remove extra Shaffar adds #22255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions data/sql/updates/pending_db_world/rev_1748707579733807961.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
6 changes: 0 additions & 6 deletions src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down