From c3c897b0352455d5d13564bf9e4a5606d423ae7a Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Sat, 24 Feb 2024 21:42:35 -0600
Subject: [PATCH] zone override

---
 src/engine/net/client/msg/TeleportRepledgeListMsg.java | 2 --
 src/engine/objects/City.java                           | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/engine/net/client/msg/TeleportRepledgeListMsg.java b/src/engine/net/client/msg/TeleportRepledgeListMsg.java
index a89c71f9..c0914577 100644
--- a/src/engine/net/client/msg/TeleportRepledgeListMsg.java
+++ b/src/engine/net/client/msg/TeleportRepledgeListMsg.java
@@ -82,8 +82,6 @@ public class TeleportRepledgeListMsg extends ClientNetMsg {
         else
             cities = City.getCitiesToRepledgeTo(player);
 
-        cities.add(City.getCity(34275));//bastion
-        cities.add(City.getCity(34081));//perdition
     }
 
     /**
diff --git a/src/engine/objects/City.java b/src/engine/objects/City.java
index d3d36eac..f872a0e7 100644
--- a/src/engine/objects/City.java
+++ b/src/engine/objects/City.java
@@ -356,7 +356,7 @@ public class City extends AbstractWorldObject {
             if (ago.getObjectType().equals(GameObjectType.City)) {
                 City city = (City) ago;
 
-                if (city.noTeleport)
+                if (city.noTeleport && city.getObjectUUID() != 34275 && city.getObjectUUID() != 34081)
                     continue;
 
                 if (city.parentZone != null && city.parentZone.isPlayerCity()) {