|
|
|
@ -306,15 +306,16 @@ public class City extends AbstractWorldObject {
@@ -306,15 +306,16 @@ public class City extends AbstractWorldObject {
|
|
|
|
|
if (city.parentZone == null) |
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
if(repledge && city.getGuild().equals(playerCharacter.guild)){ |
|
|
|
|
//can't repledge to a guild you're already part of
|
|
|
|
|
|
|
|
|
|
if (repledge && city.getGuild().equals(playerCharacter.guild)) |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (city.parentZone.guild_zone) { |
|
|
|
|
|
|
|
|
|
if(city.getGuild().getNation().equals(playerCharacter.guild.getNation())){ |
|
|
|
|
//players can all port and repledge inside their own nation
|
|
|
|
|
|
|
|
|
|
if(city.getGuild().getNation().equals(playerCharacter.guild.getNation())){ |
|
|
|
|
cities.add(city); |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
@ -325,10 +326,10 @@ public class City extends AbstractWorldObject {
@@ -325,10 +326,10 @@ public class City extends AbstractWorldObject {
|
|
|
|
|
|
|
|
|
|
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) { |
|
|
|
|
|
|
|
|
|
if (!repledge) |
|
|
|
|
if (!city.getGuild().charter.equals(playerCharacter.guild.charter)) |
|
|
|
|
if (repledge) { |
|
|
|
|
if (!city.getGuild().charter.canJoin(playerCharacter)) |
|
|
|
|
continue; |
|
|
|
|
else if (!city.getGuild().charter.canJoin(playerCharacter)) |
|
|
|
|
} else if (!city.getGuild().charter.equals(playerCharacter.guild.charter)) |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|