reverse KOS function completed

This commit is contained in:
2024-06-22 19:22:13 -05:00
parent 35427cfb4a
commit 0d24789a93
+16 -4
View File
@@ -306,7 +306,19 @@ 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) { if(repledge && city.getGuild().equals(playerCharacter.guild)){
//can't repledge to a guild you're already part of
continue;
}
if (city.parentZone.guild_zone) {
if(city.getGuild().getNation().equals(playerCharacter.guild.getNation())){
//players can all port and repledge inside their own nation
cities.add(city);
continue;
}
if (city.isOpen() && city.getTOL().rank > 4) {
// Filter Lore cities // Filter Lore cities
@@ -315,8 +327,7 @@ public class City extends AbstractWorldObject {
if (!repledge) if (!repledge)
if (!city.getGuild().charter.equals(playerCharacter.guild.charter)) if (!city.getGuild().charter.equals(playerCharacter.guild.charter))
continue; continue;
else else if (!city.getGuild().charter.canJoin(playerCharacter))
if (!city.getGuild().charter.canJoin(playerCharacter))
continue; continue;
} }
Integer playerUUID = playerCharacter.objectUUID; Integer playerUUID = playerCharacter.objectUUID;
@@ -355,6 +366,7 @@ public class City extends AbstractWorldObject {
continue; continue;
} }
} }
} else {
// Filter NPC cities // Filter NPC cities
@@ -390,7 +402,7 @@ public class City extends AbstractWorldObject {
} }
} }
}
return cities; return cities;
} }