diff --git a/src/engine/objects/City.java b/src/engine/objects/City.java index 9d38974e..b101a5cb 100644 --- a/src/engine/objects/City.java +++ b/src/engine/objects/City.java @@ -326,6 +326,10 @@ public class City extends AbstractWorldObject { cities.add(city);//this nation is allowed for the reverse KOS continue; } + if (city.getGuild().getNation().equals(pc.guild.getNation())) { + cities.add(city);//can always teleport inside your own nation + continue; + } } } } else { @@ -408,10 +412,7 @@ public class City extends AbstractWorldObject { } else if (city.isNoobIsle == 1 && playerCharacter.level <= 20) { cities.add(city); // everyone can go to noob island if they are under level 20 continue; - } else if (city.cityName.equals("Khan'Ov Srekel")) { - cities.add(city); //everyone anytime can teleport to khan - continue; - } else if (city.isOpen() && city.getTOL().rank > 4 && city.getGuild().charter.equals(playerCharacter.guild.charter)) + }else if (city.isOpen() && city.getTOL().rank > 4 && city.getGuild().charter.equals(playerCharacter.guild.charter)) if (!city.getTOL().reverseKOS) { cities.add(city);//can teleport to any open ToL that shares charter continue; @@ -428,6 +429,10 @@ public class City extends AbstractWorldObject { cities.add(city);//this nation is allowed for the reverse KOS continue; } + if (city.getGuild().getNation().equals(playerCharacter.guild.getNation())) { + cities.add(city);//can always repledge inside your own nation + continue; + } } } } else {