|
|
@ -316,6 +316,7 @@ public class City extends AbstractWorldObject { |
|
|
|
if (!city.getGuild().charter.equals(playerCharacter.guild.charter)) |
|
|
|
if (!city.getGuild().charter.equals(playerCharacter.guild.charter)) |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (repledge) |
|
|
|
if (!city.getGuild().charter.canJoin(playerCharacter)) |
|
|
|
if (!city.getGuild().charter.canJoin(playerCharacter)) |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
@ -359,6 +360,7 @@ public class City extends AbstractWorldObject { |
|
|
|
if (!city.getGuild().charter.equals(playerCharacter.guild.charter)) |
|
|
|
if (!city.getGuild().charter.equals(playerCharacter.guild.charter)) |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (repledge) |
|
|
|
if (!city.getGuild().charter.canJoin(playerCharacter)) |
|
|
|
if (!city.getGuild().charter.canJoin(playerCharacter)) |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|