From 83c86987986b80a67c66b397284623ddc96f6e4a Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Sat, 24 Feb 2024 21:44:23 -0600 Subject: [PATCH] zone override --- src/engine/objects/City.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/engine/objects/City.java b/src/engine/objects/City.java index f872a0e7..abd2fd57 100644 --- a/src/engine/objects/City.java +++ b/src/engine/objects/City.java @@ -75,9 +75,6 @@ public class City extends AbstractWorldObject { private byte isCapital = 0; private byte isSafeHold; private boolean forceRename = false; - private boolean noTeleport = false; //used by npc cities - private boolean noRepledge = false; //used by npc cities - private boolean isOpen = false; private int treeOfLifeID; private Vector3fImmutable location = Vector3fImmutable.ZERO; @@ -142,14 +139,6 @@ public class City extends AbstractWorldObject { this.forceRename = rs.getInt("forceRename") == 1; this.open = rs.getInt("open") == 1; - if (this.cityName.equals("Perdition") || this.cityName.equals("Bastion")) { - this.noTeleport = true; - this.noRepledge = true; - } else { - this.noTeleport = false; - this.noRepledge = false; - } - this.hash = rs.getString("hash"); if (this.motto.isEmpty()) { @@ -356,9 +345,6 @@ public class City extends AbstractWorldObject { if (ago.getObjectType().equals(GameObjectType.City)) { City city = (City) ago; - if (city.noTeleport && city.getObjectUUID() != 34275 && city.getObjectUUID() != 34081) - continue; - if (city.parentZone != null && city.parentZone.isPlayerCity()) { if (pc.getAccount().status.equals(AccountStatus.ADMIN)) { @@ -412,8 +398,6 @@ public class City extends AbstractWorldObject { for (AbstractGameObject ago : worldCities.values()) { if (ago.getObjectType().equals(GameObjectType.City)) { City city = (City) ago; - if (city.noRepledge) - continue; if (city.parentZone != null && city.parentZone.isPlayerCity()) {