forked from MagicBane/Server
zone override
This commit is contained in:
@@ -82,8 +82,6 @@ public class TeleportRepledgeListMsg extends ClientNetMsg {
|
|||||||
else
|
else
|
||||||
cities = City.getCitiesToRepledgeTo(player);
|
cities = City.getCitiesToRepledgeTo(player);
|
||||||
|
|
||||||
cities.add(City.getCity(34275));//bastion
|
|
||||||
cities.add(City.getCity(34081));//perdition
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -356,7 +356,7 @@ public class City extends AbstractWorldObject {
|
|||||||
if (ago.getObjectType().equals(GameObjectType.City)) {
|
if (ago.getObjectType().equals(GameObjectType.City)) {
|
||||||
City city = (City) ago;
|
City city = (City) ago;
|
||||||
|
|
||||||
if (city.noTeleport)
|
if (city.noTeleport && city.getObjectUUID() != 34275 && city.getObjectUUID() != 34081)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (city.parentZone != null && city.parentZone.isPlayerCity()) {
|
if (city.parentZone != null && city.parentZone.isPlayerCity()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user