Skip to content

Commit 470dc33

Browse files
Merge AzerothCore 3.3.5 to ElunaAzerothcore [skip ci]
2 parents 5060b24 + 9bf77e8 commit 470dc33

9 files changed

Lines changed: 635 additions & 5 deletions

File tree

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
-- DB update 2026_01_31_03 -> 2026_02_01_00
2+
--
3+
DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 15551);
4+
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`, `event_param6`, `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
5+
(15551, 0, 0, 0, 4, 0, 30, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Spectral Stable Hand - On Aggro - Say Line 0'),
6+
(15551, 0, 1, 0, 6, 0, 50, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Spectral Stable Hand - On Just Died - Say Line 1'),
7+
(15551, 0, 2, 0, 1, 0, 60, 0, 0, 70000, 80000, 190000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Spectral Stable Hand - Out of Combat - Say Line 2'),
8+
(15551, 0, 3, 0, 0, 0, 100, 0, 2000, 11000, 12000, 21000, 0, 0, 11, 18812, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Spectral Stable Hand - In Combat - Cast \'Knockdown\''),
9+
(15551, 0, 4, 0, 0, 0, 100, 0, 2000, 15000, 17000, 28000, 0, 0, 11, 6016, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Spectral Stable Hand - In Combat - Cast \'Pierce Armor\''),
10+
(15551, 0, 5, 0, 14, 0, 100, 0, 10000, 40, 12000, 22000, 0, 0, 11, 29339, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Spectral Stable Hand - Friendly Missing 10k HP and Near a Valid Target - Cast \'Healing Touch\''),
11+
(15551, 0, 6, 0, 0, 0, 100, 0, 2000, 15000, 21000, 38000, 0, 0, 11, 29340, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Spectral Stable Hand - In Combat and Near a Valid Target - Cast \'Whip Rage\'');
12+
13+
DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 22) AND (`SourceGroup` IN (6, 7)) AND (`SourceEntry` = 15551) AND (`ConditionTypeOrReference` = 29);
14+
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
15+
(22, 6, 15551, 0, 0, 29, 1, 15547, 20, 0, 0, 0, 0, '', 'Spectral Stable Hand Healing Touch (29339) Requires Valid Target Nearby'),
16+
(22, 6, 15551, 0, 1, 29, 1, 15548, 20, 0, 0, 0, 0, '', 'Spectral Stable Hand Healing Touch (29339) Requires Valid Target Nearby'),
17+
(22, 7, 15551, 0, 0, 29, 1, 15547, 20, 0, 0, 0, 0, '', 'Spectral Stable Hand Whip Rage (29340) Requires Valid Target Nearby'),
18+
(22, 7, 15551, 0, 1, 29, 1, 15548, 20, 0, 0, 0, 0, '', 'Spectral Stable Hand Whip Rage (29340) Requires Valid Target Nearby');
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-- DB update 2026_02_01_00 -> 2026_02_01_01
2+
3+
-- Set Emote to 0
4+
UPDATE `creature_addon` SET `emote` = 0 WHERE (`guid` IN (131012, 131014, 131015, 131016, 131020, 131021, 131022, 131023, 131026, 131027));
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- DB update 2026_02_01_01 -> 2026_02_01_02
2+
-- fix talk timer for 'Brewfest Setup Crew'
3+
UPDATE `smart_scripts` SET `event_param4` = 60000, `event_param5` = 360000 WHERE `entryorguid` = 23504 AND `source_type` = 0 AND `id` = 0 AND `link` = 0;

data/sql/updates/db_world/2026_02_02_00.sql

Lines changed: 604 additions & 0 deletions
Large diffs are not rendered by default.

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ struct boss_anetheron : public BossAI
117117

118118
void KilledUnit(Unit* victim) override
119119
{
120-
if (!_recentlySpoken && victim->IsPlayer())
120+
if (!_recentlySpoken && victim->IsPlayer() && me->IsAlive())
121121
{
122122
Talk(SAY_ONSLAY);
123123
_recentlySpoken = true;

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ struct boss_azgalor : public BossAI
9191

9292
void KilledUnit(Unit * victim) override
9393
{
94-
if (!_recentlySpoken && victim->IsPlayer())
94+
if (!_recentlySpoken && victim->IsPlayer() && me->IsAlive())
9595
{
9696
Talk(SAY_ONSLAY);
9797
_recentlySpoken = true;

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ struct boss_kazrogal : public BossAI
111111

112112
void KilledUnit(Unit * victim) override
113113
{
114-
if (!_recentlySpoken && victim->IsPlayer())
114+
if (!_recentlySpoken && victim->IsPlayer() && me->IsAlive())
115115
{
116116
Talk(SAY_ONSLAY);
117117
_recentlySpoken = true;

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ struct boss_rage_winterchill : public BossAI
121121

122122
void KilledUnit(Unit* victim) override
123123
{
124-
if (!_recentlySpoken && victim->IsPlayer())
124+
if (!_recentlySpoken && victim->IsPlayer() && me->IsAlive())
125125
{
126126
Talk(SAY_ONSLAY);
127127
_recentlySpoken = true;

src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ class boss_sapphiron : public CreatureScript
128128
spawnTimer = 0;
129129
currentTarget.Clear();
130130
blockList.clear();
131+
me->SetAnimTier(AnimTier::Fly);
131132
}
132133

133134
void EnterCombatSelfFunction()
@@ -291,7 +292,7 @@ class boss_sapphiron : public CreatureScript
291292
me->AttackStop();
292293
float x, y, z, o;
293294
me->GetHomePosition(x, y, z, o);
294-
me->GetMotionMaster()->MovePoint(POINT_CENTER, x, y, z);
295+
me->GetMotionMaster()->MovePoint(POINT_CENTER, x, y, z, FORCED_MOVEMENT_NONE, 0.f, o);
295296
return;
296297
case EVENT_FLIGHT_LIFTOFF:
297298
Talk(EMOTE_AIR_PHASE);

0 commit comments

Comments
 (0)