From c5593ea9808548838f15749c0e204a7e95428d01 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Tue, 31 May 2022 20:02:02 -0400
Subject: [PATCH] Core/Corpses: Fixed crash in corpse creation

Port From (https://github.com/TrinityCore/TrinityCore/commit/5e90f188f80d217b95606caf745e82253f3a4d47)
---
 Source/Game/Entities/Corpse.cs        | 3 ---
 Source/Game/Entities/Player/Player.cs | 3 +++
 Source/Game/Maps/Map.cs               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/Game/Entities/Corpse.cs b/Source/Game/Entities/Corpse.cs
index 50816248e..29810c71c 100644
--- a/Source/Game/Entities/Corpse.cs
+++ b/Source/Game/Entities/Corpse.cs
@@ -89,9 +89,6 @@ namespace Game.Entities
 
             PhasingHandler.InheritPhaseShift(this, owner);
 
-            UpdatePositionData();
-            SetZoneScript();
-
             return true;
         }
 
diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs
index c5983f092..1a1777a4c 100644
--- a/Source/Game/Entities/Player/Player.cs
+++ b/Source/Game/Entities/Player/Player.cs
@@ -4536,6 +4536,9 @@ namespace Game.Entities
             // register for player, but not show
             GetMap().AddCorpse(corpse);
 
+            corpse.UpdatePositionData();
+            corpse.SetZoneScript();
+
             // we do not need to save corpses for BG/arenas
             if (!GetMap().IsBattlegroundOrArena())
                 corpse.SaveToDB();
diff --git a/Source/Game/Maps/Map.cs b/Source/Game/Maps/Map.cs
index 2865cdc94..4bc03ba2b 100644
--- a/Source/Game/Maps/Map.cs
+++ b/Source/Game/Maps/Map.cs
@@ -3411,11 +3411,11 @@ namespace Game.Maps
 
                 PhasingHandler.InheritPhaseShift(bones, corpse);
 
+                AddCorpse(bones);
+
                 bones.UpdatePositionData();
                 bones.SetZoneScript();
 
-                AddCorpse(bones);
-
                 // add bones in grid store if grid loaded where corpse placed
                 AddToMap(bones);
             }