|
|
|
@ -316,8 +316,9 @@ public class City extends AbstractWorldObject {
@@ -316,8 +316,9 @@ public class City extends AbstractWorldObject {
|
|
|
|
|
if (!city.getGuild().charter.equals(playerCharacter.guild.charter)) |
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
if (!city.getGuild().charter.canJoin(playerCharacter)) |
|
|
|
|
continue; |
|
|
|
|
if (repledge) |
|
|
|
|
if (!city.getGuild().charter.canJoin(playerCharacter)) |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (!city.getTOL().reverseKOS) { |
|
|
|
@ -359,8 +360,9 @@ public class City extends AbstractWorldObject {
@@ -359,8 +360,9 @@ public class City extends AbstractWorldObject {
|
|
|
|
|
if (!city.getGuild().charter.equals(playerCharacter.guild.charter)) |
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
if (!city.getGuild().charter.canJoin(playerCharacter)) |
|
|
|
|
continue; |
|
|
|
|
if (repledge) |
|
|
|
|
if (!city.getGuild().charter.canJoin(playerCharacter)) |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (city.isNpc == 1) |
|
|
|
|