Core/Battlegrounds: Made Battleground inherit ZoneScript

Port From (https://github.com/TrinityCore/TrinityCore/commit/21940405e009f5c1d201eb96d96ea251a3313af3)
2023-01-04 16:37:19 -05:00
parent 54359e4109
commit 99dbb422e1
3 changed files with 13 additions and 10 deletions
@@ -1494,13 +1494,18 @@ namespace Game.Entities
                InstanceMap instanceMap = map.ToInstanceMap();
                if (instanceMap != null)
                    return (ZoneScript)instanceMap.GetInstanceScript();
-                else if (!map.IsBattlegroundOrArena())
+
+                BattlegroundMap bgMap = map.ToBattlegroundMap();
+                if (bgMap != null)
+                    return (ZoneScript)bgMap.GetBG();
+
+                if (!map.IsBattlegroundOrArena())
                {
                    BattleField bf = Global.BattleFieldMgr.GetBattlefieldToZoneId(map, GetZoneId());
                    if (bf != null)
                        return bf;
-                    else
-                        return Global.OutdoorPvPMgr.GetOutdoorPvPToZoneId(map, GetZoneId());
+                    
+                    return Global.OutdoorPvPMgr.GetOutdoorPvPToZoneId(map, GetZoneId());
                }
            }