diff --git a/sql/updates/world/custom/custom_2019_02_17_04_world.sql b/sql/updates/world/custom/custom_2019_02_17_04_world.sql new file mode 100644 index 00000000000..4d7abe647ee --- /dev/null +++ b/sql/updates/world/custom/custom_2019_02_17_04_world.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `speed_run`= 0.42857 WHERE `entry`= 46304; diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp index ef3da8255de..d4724786508 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp @@ -1399,14 +1399,24 @@ class spell_valiona_devouring_flames_targeting : public SpellScriptLoader } }; -class TheralionVictimCheck +class TwilightMeteoriteCheck { public: - TheralionVictimCheck(Unit* _theralion) : theralion(_theralion) { } + TwilightMeteoriteCheck(Unit* _theralion) : theralion(_theralion) { } bool operator()(WorldObject* object) { - return (theralion->GetVictim() && theralion->GetVictim() == object->ToUnit()); + Unit* unit = object->ToUnit(); + if (!unit) + return true; + + if (theralion->GetVictim() && theralion->GetVictim() == unit) + return true; + + if (unit->GetPhaseShift().HasPhase(PHASE_ID_TWILIGHT_SHIFT)) + return true; + + return false; } private: Unit* theralion; @@ -1430,7 +1440,7 @@ class spell_valiona_twilight_meteorite_targeting : public SpellScriptLoader if (Unit* caster = GetCaster()) if (InstanceScript* instance = caster->GetInstanceScript()) if (Creature* theralion = instance->GetCreature(DATA_THERALION)) - targets.remove_if(TheralionVictimCheck(theralion)); + targets.remove_if(TwilightMeteoriteCheck(theralion)); if (targets.empty()) return; diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/instance_bastion_of_twilight.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/instance_bastion_of_twilight.cpp index 0db90bd4d98..e87760bc03c 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/instance_bastion_of_twilight.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/instance_bastion_of_twilight.cpp @@ -91,7 +91,6 @@ class instance_bastion_of_twilight : public InstanceMapScript _deadOrphanedEmeraldWhelps = 0; _lastAreatriggerIndex = 0; _fullHeroicId = instance->IsHeroic(); - _valionaAuraDummyGUID = ObjectGuid::Empty; GenerateHalfusDragonData(); }