From cc1180050ef2909984703d97ecfc7ca5abd12094 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Tue, 23 May 2023 08:17:17 -0400
Subject: [PATCH] Core/Graveyards: Fix graveyards in subzones when there is no
 valid graveyard in that subzone

Port From (https://github.com/TrinityCore/TrinityCore/commit/7ba4e2df84e4ddefb080f71685294c619a8397de)
---
 Source/Game/Globals/ObjectManager.cs | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/Source/Game/Globals/ObjectManager.cs b/Source/Game/Globals/ObjectManager.cs
index 5e2d21548..b5d2c52f3 100644
--- a/Source/Game/Globals/ObjectManager.cs
+++ b/Source/Game/Globals/ObjectManager.cs
@@ -864,6 +864,26 @@ namespace Game
                 }
             }
 
+            var graveyard = GetClosestGraveyardInZone(location, team, conditionObject, zoneId);
+            var zoneEntry = CliDB.AreaTableStorage.LookupByKey(zoneId);
+            var parentEntry = CliDB.AreaTableStorage.LookupByKey(zoneEntry.ParentAreaID);
+
+            while (graveyard == null && parentEntry != null)
+            {
+                graveyard = GetClosestGraveyardInZone(location, team, conditionObject, parentEntry.Id);
+                if (graveyard == null && parentEntry.ParentAreaID != 0)
+                    parentEntry = CliDB.AreaTableStorage.LookupByKey(parentEntry.ParentAreaID);
+                else // nothing found, cant look further, give up.
+                    parentEntry = null;
+            }
+
+            return graveyard;
+        }
+
+        WorldSafeLocsEntry GetClosestGraveyardInZone(WorldLocation location, Team team, WorldObject conditionObject, uint zoneId)
+        {
+            location.GetPosition(out float x, out float y, out float z);
+            uint MapId = location.GetMapId();
             // Simulate std. algorithm:
             //   found some graveyard associated to (ghost_zone, ghost_map)
             //
@@ -981,6 +1001,7 @@ namespace Game
 
             return entryFar;
         }
+
         public GraveYardData FindGraveYardData(uint id, uint zoneId)
         {
             var range = GraveYardStorage.LookupByKey(zoneId);
@@ -991,6 +1012,7 @@ namespace Game
             }
             return null;
         }
+
         public WorldSafeLocsEntry GetWorldSafeLoc(uint id)
         {
             return _worldSafeLocs.LookupByKey(id);