Browse Source

zone override

birdbane
FatBoy-DOTC 9 months ago
parent
commit
c3c897b035
  1. 2
      src/engine/net/client/msg/TeleportRepledgeListMsg.java
  2. 2
      src/engine/objects/City.java

2
src/engine/net/client/msg/TeleportRepledgeListMsg.java

@ -82,8 +82,6 @@ public class TeleportRepledgeListMsg extends ClientNetMsg { @@ -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
}
/**

2
src/engine/objects/City.java

@ -356,7 +356,7 @@ public class City extends AbstractWorldObject { @@ -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()) {

Loading…
Cancel
Save