Core/Scripts: Process the reset of Mandokir (ZulGurub)

* Closes #16640

1 files changed, 7 insertions, 2 deletions

diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
index 8c179af2adf..3697b0876c8 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -148,6 +148,11 @@ class boss_mandokir : public CreatureScript
                 instance->SaveToDB();
             }
 
+            void JustReachedHome() override
+            {
+                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
+            }
+
             void EnterCombat(Unit* /*who*/) override
             {
                 _EnterCombat();
@@ -194,9 +199,9 @@ class boss_mandokir : public CreatureScript
                     me->SetWalk(false);
                     if (id == POINT_MANDOKIR_END)
                     {
-                        me->SetHomePosition(PosMandokir[0]);
+                        me->SetHomePosition(PosMandokir[1]);
+                        me->GetMotionMaster()->MoveTargetedHome();
                         instance->SetBossState(DATA_MANDOKIR, NOT_STARTED);
-                        me->DespawnOrUnsummon(6000); // No idea how to respawn on wipe.
                     }
                 }
             }