From 6c1846ad8fec1322ec63b5255b33140f9027cffa Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Wed, 8 Dec 2021 21:31:04 +0100
Subject: [PATCH] fix(Scripts/Brewfest): Set proper npc entry to
 `NPC_NORMAL_VOODOO` (#9262)

* fix(Scripts/Brewfest): Set proper npc entry to `NPC_NORMAL_VOODOO`

Fixes #8027
---
 src/server/scripts/Events/brewfest.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/server/scripts/Events/brewfest.cpp b/src/server/scripts/Events/brewfest.cpp
index fb92fced1..88a1ecef1 100644
--- a/src/server/scripts/Events/brewfest.cpp
+++ b/src/server/scripts/Events/brewfest.cpp
@@ -303,7 +303,7 @@ enum darkIronAttack
     NPC_MOLE_MACHINE_TRIGGER            = 23894,
     NPC_DARK_IRON_GUZZLER               = 23709,
     NPC_NORMAL_DROHN                    = 24492,
-    NPC_NORMAL_VOODOO                   = 21349,
+    NPC_NORMAL_VOODOO                   = 24493,
     NPC_NORMAL_BARLEYBREW               = 23683,
     NPC_NORMAL_THUNDERBREW              = 23684,
     NPC_NORMAL_GORDOK                   = 23685,
@@ -1331,8 +1331,8 @@ public:
         {
             if (Unit* caster = GetCaster())
             {
-                float z = caster->GetMapHeight(caster->GetPositionX() + 14 * cos(caster->GetOrientation()), caster->GetPositionY() + 14 * sin(caster->GetOrientation()), caster->GetPositionZ());
-                WorldLocation pPosition = WorldLocation(caster->GetMapId(), caster->GetPositionX() + 14 * cos(caster->GetOrientation()), caster->GetPositionY() + 14 * sin(caster->GetOrientation()), z, caster->GetOrientation());
+                WorldLocation pPosition = WorldLocation(*caster);
+                caster->MovePositionToFirstCollision(pPosition, 14.f, 0.f);
                 SetExplTargetDest(pPosition);
             }