|
|
|
@ -300,6 +300,8 @@ public class City extends AbstractWorldObject {
@@ -300,6 +300,8 @@ public class City extends AbstractWorldObject {
|
|
|
|
|
//handle compiling of cities able to be teleported to for lore rule-set
|
|
|
|
|
for (AbstractGameObject ago : worldCities.values()) { |
|
|
|
|
City city = (City) ago; |
|
|
|
|
if(city.cityName.equals("Perdition") || city.cityName.equals("Bastion")) |
|
|
|
|
continue; // cannot teleport to perdition or bastion
|
|
|
|
|
if (city.isNpc == 1 && city.getGuild().charter.equals(pc.guild.charter)) { |
|
|
|
|
cities.add(city); // anyone of the same charter can teleport to a safehold of that charter
|
|
|
|
|
continue; |
|
|
|
@ -405,6 +407,8 @@ public class City extends AbstractWorldObject {
@@ -405,6 +407,8 @@ public class City extends AbstractWorldObject {
|
|
|
|
|
//handle compiling of cities able to be repledged to for lore rule-set
|
|
|
|
|
for (AbstractGameObject ago : worldCities.values()) { |
|
|
|
|
City city = (City) ago; |
|
|
|
|
if(city.cityName.equals("Perdition") || city.cityName.equals("Bastion")) |
|
|
|
|
continue; // cannot repledge to perdition or bastion
|
|
|
|
|
if (city.isNpc == 1 && city.getGuild().charter.canJoin(playerCharacter)) { |
|
|
|
|
cities.add(city); // anyone of the same charter can teleport to a safehold of that charter
|
|
|
|
|
continue; |
|
|
|
|