From 7cae4f5a16561034fce54aa275f45e49401ddf3e Mon Sep 17 00:00:00 2001
From: blinkysc <37940565+blinkysc@users.noreply.github.com>
Date: Wed, 23 Apr 2025 16:45:25 -0500
Subject: [PATCH] fix(Script/Sunwell): Use raycast to prevent Singularity
 throwing players through walls (#21928)

---
 .../SunwellPlateau/boss_muru.cpp              | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
index c1f8ff8bc..0f3751f31 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
@@ -23,6 +23,8 @@
 #include "SpellScript.h"
 #include "SpellScriptLoader.h"
 #include "sunwell_plateau.h"
+#include "VMapFactory.h"
+#include "VMapMgr2.h"
 
 enum Spells
 {
@@ -421,6 +423,28 @@ class spell_entropius_void_zone_visual_aura : public AuraScript
 class spell_entropius_black_hole_effect : public SpellScript
 {
     PrepareSpellScript(spell_entropius_black_hole_effect);
+    float RaycastToObstacle(Unit* unit, float angle, float z, float maxDist = 20.0f)
+    {
+        float baseX = unit->GetPositionX();
+        float baseY = unit->GetPositionY();
+        float targetX = baseX + maxDist * cos(angle);
+        float targetY = baseY + maxDist * sin(angle);
+        float hitX, hitY, hitZ;
+        if (VMAP::VMapFactory::createOrGetVMapMgr()->GetObjectHitPos(
+                unit->GetMapId(),
+                baseX, baseY, z,
+                targetX, targetY, z,
+                hitX, hitY, hitZ,
+                0.0f))
+        {
+            return std::sqrt(
+                std::pow(hitX - baseX, 2) +
+                std::pow(hitY - baseY, 2) +
+                std::pow(hitZ - z, 2)
+            );
+        }
+        return maxDist;
+    }
 
     void HandlePull(SpellEffIndex effIndex)
     {
@@ -428,21 +452,25 @@ class spell_entropius_black_hole_effect : public SpellScript
         Unit* target = GetHitUnit();
         if (!target)
             return;
-
         Position pos;
         if (target->GetDistance(GetCaster()) < 5.0f)
         {
             float o = frand(0, 2 * M_PI);
-            pos.Relocate(GetCaster()->GetPositionX() + 8.0f * cos(o),
-                         GetCaster()->GetPositionY() + 8.0f * std::sin(o),
-                         GetCaster()->GetPositionZ() + frand(2.0f, 5.0f));
+            float z = GetCaster()->GetPositionZ() + frand(1.0f, 2.0f);
+            float safeDistance = RaycastToObstacle(GetCaster(), o, z, 10.0f);
+            float actualDistance = std::min(8.0f, safeDistance * 0.8f);
+
+            pos.Relocate(
+                GetCaster()->GetPositionX() + actualDistance * cos(o),
+                GetCaster()->GetPositionY() + actualDistance * sin(o),
+                z
+            );
         }
         else
             pos.Relocate(GetCaster()->GetPositionX(), GetCaster()->GetPositionY(), GetCaster()->GetPositionZ() + 1.0f);
 
         float speedXY = float(GetSpellInfo()->Effects[effIndex].MiscValue) * 0.1f;
         float speedZ = target->GetDistance(pos) / speedXY * 0.5f * Movement::gravity;
-
         target->GetMotionMaster()->MoveJump(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), speedXY, speedZ);
     }