fix(Scripts/SerpentshrineCavern): Fix Lurker spawn coords and spout s… (

azerothcore#18014) fix(Scripts/SerpentshrineCavern): Fix Lurker spawn coords and spout shouldnt hit players on water at all
Ramys · Dec 14, 2023 · 9df2c48 · 9df2c48
1 parent 06525cd
commit 9df2c48
Showing 1 changed file with 4 additions and 17 deletions.
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -147,7 +147,7 @@ struct boss_the_lurker_below : public BossAI
         {
             //phase2
             scheduler.CancelAll();
-            DoCastSelf(SPELL_SUBMERGE_VISUAL, true);
+            DoCastSelf(SPELL_SUBMERGE_VISUAL);
             DoCastSelf(SPELL_CLEAR_ALL_DEBUFFS, true);
             me->SetStandState(UNIT_STAND_STATE_SUBMERGED);
             me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
@@ -226,7 +226,7 @@ class go_strange_pool : public GameObjectScript
             if (roll_chance_i(instance->GetBossState(DATA_THE_LURKER_BELOW) != DONE ? 25 : 0) && !instance->IsEncounterInProgress())
             {
                 player->CastSpell(player, SPELL_LURKER_SPAWN_TRIGGER, true);
-                if (Creature* lurker = go->SummonCreature(NPC_THE_LURKER_BELOW, 40.4058f, -417.108f, -21.5911f, 3.03312f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 604800000))
+                if (Creature* lurker = go->SummonCreature(NPC_THE_LURKER_BELOW, 38.4567f, -417.324f, -18.916666f, 2.94960f, TEMPSUMMON_MANUAL_DESPAWN))
                     lurker->AI()->DoAction(ACTION_START_EVENT);
                 return true;
             }
@@ -284,22 +284,9 @@ class spell_lurker_below_spout_cone : public SpellScript
 
     void FilterTargets(std::list<WorldObject*>& targets)
     {
-        Unit* caster = GetCaster();
-        targets.remove_if([caster](WorldObject const* target) -> bool
+        targets.remove_if([this](WorldObject const* target) -> bool
         {
-            if (!caster->HasInLine(target, 5.0f) || !target->IsPlayer())
-            {
-                return true;
-            }
-
-            LiquidData const& liquidData = target->GetLiquidData();
-
-            if (liquidData.Status == LIQUID_MAP_UNDER_WATER)
-            {
-                return true;
-            }
-
-            return false;
+            return !GetCaster()->HasInLine(target, 5.0f) || !target->IsPlayer() || target->ToUnit()->IsInWater();
         });
     }