|
|
@ -395,8 +395,14 @@ public class City extends AbstractWorldObject { |
|
|
|
//open city, just list
|
|
|
|
//open city, just list
|
|
|
|
if (city.open && city.getTOL() != null && city.getTOL().getRank() > 4) { |
|
|
|
if (city.open && city.getTOL() != null && city.getTOL().getRank() > 4) { |
|
|
|
cities.add(city); |
|
|
|
cities.add(city); |
|
|
|
}else if(city.getGuild().getNation().equals(pc.guild.getNation())){ |
|
|
|
}else { |
|
|
|
cities.add(city); |
|
|
|
try { |
|
|
|
|
|
|
|
if (city.getGuild().getNation().equals(pc.guild.getNation())) { |
|
|
|
|
|
|
|
cities.add(city); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}catch(Exception e){ |
|
|
|
|
|
|
|
Logger.error(e); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} else if (city.isNpc == 1) { |
|
|
|
} else if (city.isNpc == 1) { |
|
|
|