|
|
@ -286,7 +286,7 @@ public class City extends AbstractWorldObject { |
|
|
|
return city.getBindLoc(); |
|
|
|
return city.getBindLoc(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public static ArrayList<City> getCitiesToTeleportTo(PlayerCharacter playerCharacter) { |
|
|
|
public static ArrayList<City> getCitiesToTeleportTo(PlayerCharacter playerCharacter, boolean repledge) { |
|
|
|
|
|
|
|
|
|
|
|
ArrayList<City> cities = new ArrayList<>(); |
|
|
|
ArrayList<City> cities = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
|
@ -307,7 +307,6 @@ public class City extends AbstractWorldObject { |
|
|
|
|
|
|
|
|
|
|
|
if (city.parentZone == null) |
|
|
|
if (city.parentZone == null) |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (city.parentZone.guild_zone && city.isOpen() && city.getTOL().rank > 4 && city.getGuild().charter.equals(playerCharacter.guild.charter)) { |
|
|
|
if (city.parentZone.guild_zone && city.isOpen() && city.getTOL().rank > 4 && city.getGuild().charter.equals(playerCharacter.guild.charter)) { |
|
|
|
|
|
|
|
|
|
|
|