diff options
| -rw-r--r-- | sql/updates/world/2016_02_13_00_world.sql | 4 | ||||
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/sql/updates/world/2016_02_13_00_world.sql b/sql/updates/world/2016_02_13_00_world.sql new file mode 100644 index 00000000000..2341e33a8b5 --- /dev/null +++ b/sql/updates/world/2016_02_13_00_world.sql @@ -0,0 +1,4 @@ +SET @ENTRY:=23258; +SET @AURA:=40670; +DELETE FROM `creature_template_addon` WHERE `entry` = @ENTRY; +INSERT INTO `creature_template_addon` (`entry`, `auras`) VALUES (@ENTRY, @AURA); diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index bb28f660e1d..80b4fac4333 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -2575,9 +2575,8 @@ class npc_train_wrecker : public CreatureScript enum EgbertMisc { - SPELL_EGBERT = 40670, - SPELL_EGBERT2 = 40669, - EVENT_RETURN = 3, + SPELL_EGBERT = 40669, + EVENT_RETURN = 3 }; class npc_egbert : public CreatureScript @@ -2599,7 +2598,6 @@ public: _events.Reset(); if (Unit* owner = me->GetCharmerOrOwner()) me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, me->GetFollowAngle()); - me->CastSpell(me, SPELL_EGBERT); } void EnterEvadeMode(EvadeReason why) override @@ -2618,12 +2616,12 @@ public: { if (!me->IsWithinDist(owner, 40.f)) { - me->RemoveAura(SPELL_EGBERT2); + me->RemoveAura(SPELL_EGBERT); me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, me->GetFollowAngle()); } } - if (me->HasAura(SPELL_EGBERT2)) + if (me->HasAura(SPELL_EGBERT)) _events.ScheduleEvent(EVENT_RETURN, urandms(5, 20)); while (uint32 eventId = _events.ExecuteEvent()) @@ -2631,7 +2629,7 @@ public: switch (eventId) { case EVENT_RETURN: - me->RemoveAura(SPELL_EGBERT2); + me->RemoveAura(SPELL_EGBERT); break; default: break; |