From 2be8a1f18907cde5da824dd3c98c0e7d81a43bd6 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 24 Nov 2021 19:33:43 +0100 Subject: Core/Misc: PORT CURSED REFACTORS FROM e69570dd7662848ae38628c4af71cce002dd1c3d WHO ON EARTH THOUGHT IT WAS A GOOD IDEA TO ADD REFACTORS TO A CHERRY-PICK COMMIT??? --- .../CullingOfStratholme/instance_culling_of_stratholme.cpp | 14 +++++++------- .../scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp | 10 ++++++++-- 2 files changed, 15 insertions(+), 9 deletions(-) (limited to 'src/server/scripts/Kalimdor') diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index 5714aa88b0a..a16cfdf95ea 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -15,15 +15,15 @@ * with this program. If not, see . */ -#include "ScriptMgr.h" +#include "culling_of_stratholme.h" #include "Creature.h" #include "CreatureAI.h" -#include "culling_of_stratholme.h" #include "EventMap.h" #include "GameObject.h" #include "InstanceScript.h" #include "Map.h" #include "MotionMaster.h" +#include "ScriptMgr.h" #include "TemporarySummon.h" #include "WorldStatePackets.h" @@ -72,11 +72,11 @@ class instance_culling_of_stratholme : public InstanceMapScript void FillInitialWorldStates(WorldPackets::WorldState::InitWorldStates& packet) override { - packet.Worldstates.emplace_back(uint32(WORLDSTATE_SHOW_CRATES), 1); - packet.Worldstates.emplace_back(uint32(WORLDSTATE_CRATES_REVEALED), int32(_crateCount)); - packet.Worldstates.emplace_back(uint32(WORLDSTATE_WAVE_COUNT), 0); - packet.Worldstates.emplace_back(uint32(WORLDSTATE_TIME_GUARDIAN), 25); - packet.Worldstates.emplace_back(uint32(WORLDSTATE_TIME_GUARDIAN_SHOW), 0); + packet.Worldstates.emplace_back(WORLDSTATE_SHOW_CRATES, 1); + packet.Worldstates.emplace_back(WORLDSTATE_CRATES_REVEALED, _crateCount); + packet.Worldstates.emplace_back(WORLDSTATE_WAVE_COUNT, 0); + packet.Worldstates.emplace_back(WORLDSTATE_TIME_GUARDIAN, 25); + packet.Worldstates.emplace_back(WORLDSTATE_TIME_GUARDIAN_SHOW, 0); } void OnCreatureCreate(Creature* creature) override diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 40cd1ab08aa..82884269013 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -220,9 +220,15 @@ class spell_skeram_arcane_explosion : public SpellScriptLoader void FilterTargets(std::list& targets) { - targets.remove_if([](WorldObject* target) + targets.remove_if([](WorldObject* object) -> bool { - return target->GetTypeId() != TYPEID_PLAYER && (target->GetTypeId() != TYPEID_UNIT || !target->ToUnit()->IsPet()); + if (object->GetTypeId() == TYPEID_PLAYER) + return false; + + if (Creature* creature = object->ToCreature()) + return !creature->IsPet(); + + return true; }); } -- cgit v1.2.3