diff options
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/boss_emerald_dragons.cpp | 16 | ||||
| -rw-r--r-- | src/server/scripts/World/npc_guard.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 18 |
3 files changed, 19 insertions, 19 deletions
diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index c6839cdb836..39b16715a71 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -272,10 +272,10 @@ class boss_ysondre : public CreatureScript events.ScheduleEvent(EVENT_LIGHTNING_WAVE, 12000); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_YSONDRE_AGGRO); - WorldBossAI::EnterCombat(who); + WorldBossAI::JustEngagedWith(who); } // Summon druid spirits on 75%, 50% and 25% health @@ -366,10 +366,10 @@ class boss_lethon : public CreatureScript events.ScheduleEvent(EVENT_SHADOW_BOLT_WHIRL, 10000); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_LETHON_AGGRO); - WorldBossAI::EnterCombat(who); + WorldBossAI::JustEngagedWith(who); } void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override @@ -501,10 +501,10 @@ class boss_emeriss : public CreatureScript emerald_dragonAI::KilledUnit(who); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_EMERISS_AGGRO); - WorldBossAI::EnterCombat(who); + WorldBossAI::JustEngagedWith(who); } void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override @@ -599,10 +599,10 @@ class boss_taerar : public CreatureScript events.ScheduleEvent(EVENT_BELLOWING_ROAR, 30000); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { Talk(SAY_TAERAR_AGGRO); - emerald_dragonAI::EnterCombat(who); + emerald_dragonAI::JustEngagedWith(who); } void SummonedCreatureDies(Creature* /*summon*/, Unit* /*killer*/) override diff --git a/src/server/scripts/World/npc_guard.cpp b/src/server/scripts/World/npc_guard.cpp index 4a18782348d..d8b018575f4 100644 --- a/src/server/scripts/World/npc_guard.cpp +++ b/src/server/scripts/World/npc_guard.cpp @@ -111,7 +111,7 @@ struct npc_guard_generic : public GuardAI DoReplyToTextEmote(textEmote); } - void EnterCombat(Unit* who) override + void JustEngagedWith(Unit* who) override { if (me->GetEntry() == NPC_CENARION_HOLD_INFANTRY) Talk(SAY_GUARD_SIL_AGGRO, who); @@ -199,7 +199,7 @@ struct npc_guard_shattrath_faction : public GuardAI _scheduler.CancelAll(); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { ScheduleVanish(); } diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 601f0d23421..3c8dac9d8de 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -287,7 +287,7 @@ public: me->RemoveNpcFlag(UNIT_NPC_FLAG_QUESTGIVER); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { @@ -408,7 +408,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void ReceiveEmote(Player* player, uint32 emote) override { @@ -793,7 +793,7 @@ public: void UpdateAI(uint32 diff) override; - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void QuestAccept(Player* player, Quest const* quest) override { @@ -865,7 +865,7 @@ public: } } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SpellHit(Unit* caster, SpellInfo const* spell) override { @@ -1071,7 +1071,7 @@ public: me->SetHealth(me->CountPctFromMaxHealth(70)); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void SpellHit(Unit* caster, SpellInfo const* spell) override { @@ -1173,7 +1173,7 @@ public: me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* /*who*/) override + void JustEngagedWith(Unit* /*who*/) override { } @@ -1386,7 +1386,7 @@ public: npc_steam_tonkAI(Creature* creature) : ScriptedAI(creature) { } void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void OnPossess(bool apply) { @@ -1439,7 +1439,7 @@ public: Initialize(); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void AttackStart(Unit* /*who*/) override { } void MoveInLineOfSight(Unit* /*who*/) override { } @@ -2347,7 +2347,7 @@ public: me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); } - void EnterCombat(Unit* /*who*/) override { } + void JustEngagedWith(Unit* /*who*/) override { } void DoAction(int32 /*param*/) override { |