aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeader <keader.android@gmail.com>2020-04-15 11:28:46 -0300
committerShauren <shauren.trinity@gmail.com>2022-01-01 15:54:52 +0100
commit6957dd9bd62a3e958bef659ddf17247b68559f8a (patch)
tree8f70d5d5000ab2fc2205ea1f73d3dc0647dc582a
parent4665a2bc405f10aaa36664aa062424b452e1bd43 (diff)
Scripts/Ulduar: Little improvements in Auriaya
* Removed DespawnAtEvade * Fix Feral Defender Damage (cherry picked from commit 77dd751499a92eb06b66eadd00bbc71da07e62be)
-rw-r--r--sql/updates/world/master/2022_01_01_22_world_2020_04_15_05_world.sql3
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp11
2 files changed, 8 insertions, 6 deletions
diff --git a/sql/updates/world/master/2022_01_01_22_world_2020_04_15_05_world.sql b/sql/updates/world/master/2022_01_01_22_world_2020_04_15_05_world.sql
new file mode 100644
index 00000000000..ebdca94bb96
--- /dev/null
+++ b/sql/updates/world/master/2022_01_01_22_world_2020_04_15_05_world.sql
@@ -0,0 +1,3 @@
+-- Feral Defender Damage
+UPDATE `creature_template` SET `DamageModifier`=13 WHERE `entry`=34035;
+UPDATE `creature_template` SET `DamageModifier`=25 WHERE `entry`=34171;
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
index 2400d7c459c..c480100327f 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
@@ -150,10 +150,10 @@ struct boss_auriaya : public BossAI
me->GetCreatureListWithEntryInGrid(catList, NPC_SANCTUM_SENTRY, 500.0f);
for (std::list<Creature*>::const_iterator itr = catList.begin(); itr != catList.end(); ++itr)
{
- if (isResetting)
- (*itr)->Respawn();
- else
+ if (!isResetting)
(*itr)->DespawnOrUnsummon();
+ else if (!(*itr)->IsAlive())
+ (*itr)->Respawn(true);
}
}
@@ -211,11 +211,10 @@ struct boss_auriaya : public BossAI
HandleCats(false);
}
- void EnterEvadeMode(EvadeReason /*why*/) override
+ void EnterEvadeMode(EvadeReason why) override
{
instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me);
- summons.DespawnAll();
- _DespawnAtEvade(Seconds(5));
+ BossAI::EnterEvadeMode(why);
}
void UpdateAI(uint32 diff) override