forked from MagicBane/Server
reverse KOS function completed
This commit is contained in:
@@ -306,91 +306,103 @@ 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;
|
||||||
|
}
|
||||||
|
|
||||||
// Filter Lore cities
|
if (city.parentZone.guild_zone) {
|
||||||
|
|
||||||
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
|
if(city.getGuild().getNation().equals(playerCharacter.guild.getNation())){
|
||||||
|
//players can all port and repledge inside their own nation
|
||||||
if (!repledge)
|
|
||||||
if (!city.getGuild().charter.equals(playerCharacter.guild.charter))
|
|
||||||
continue;
|
|
||||||
else
|
|
||||||
if (!city.getGuild().charter.canJoin(playerCharacter))
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
Integer playerUUID = playerCharacter.objectUUID;
|
|
||||||
Integer guildUUID = playerCharacter.guildUUID;
|
|
||||||
Integer nationUUID = playerCharacter.guild.getNation().getObjectUUID();
|
|
||||||
boolean allowed = false;
|
|
||||||
if (city.getTOL().reverseKOS) {
|
|
||||||
//reverse KOS, specific values are allowed
|
|
||||||
if (city.getTOL().getCondemned().contains(playerUUID) && city.getTOL().getCondemned().get(playerUUID).active) {
|
|
||||||
//individual is cleared for teleport/repledge
|
|
||||||
allowed = true;
|
|
||||||
} else if (city.getTOL().getCondemned().contains(guildUUID) && city.getTOL().getCondemned().get(guildUUID).active) {
|
|
||||||
//player guild is cleared for teleport/repledge
|
|
||||||
allowed = true;
|
|
||||||
} else if (city.getTOL().getCondemned().contains(nationUUID) && city.getTOL().getCondemned().get(nationUUID).active) {
|
|
||||||
//player nation is cleared for teleport/repledge
|
|
||||||
allowed = true;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
//not reverse KOS, everyone is allowed by default
|
|
||||||
allowed = true;
|
|
||||||
//specific values are not allowed
|
|
||||||
if (city.getTOL().getCondemned().contains(playerUUID) && city.getTOL().getCondemned().get(playerUUID).active) {
|
|
||||||
//individual is cleared for teleport/repledge
|
|
||||||
allowed = false;
|
|
||||||
} else if (city.getTOL().getCondemned().contains(guildUUID) && city.getTOL().getCondemned().get(guildUUID).active) {
|
|
||||||
//player guild is cleared for teleport/repledge
|
|
||||||
allowed = false;
|
|
||||||
} else if (city.getTOL().getCondemned().contains(nationUUID) && city.getTOL().getCondemned().get(nationUUID).active) {
|
|
||||||
//player nation is cleared for teleport/repledge
|
|
||||||
allowed = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (allowed) {
|
|
||||||
cities.add(city);
|
cities.add(city);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
if (city.isOpen() && city.getTOL().rank > 4) {
|
||||||
|
|
||||||
// Filter NPC cities
|
// Filter Lore cities
|
||||||
|
|
||||||
if (city.isNoobIsle == 1) {
|
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
|
||||||
|
|
||||||
if (playerCharacter.level < 20)
|
if (!repledge)
|
||||||
cities.add(city); // everyone can go to noob island if they are under level 20
|
if (!city.getGuild().charter.equals(playerCharacter.guild.charter))
|
||||||
|
continue;
|
||||||
continue;
|
else if (!city.getGuild().charter.canJoin(playerCharacter))
|
||||||
}
|
continue;
|
||||||
|
}
|
||||||
// Players cannot teleport to perdition or bastion
|
Integer playerUUID = playerCharacter.objectUUID;
|
||||||
|
Integer guildUUID = playerCharacter.guildUUID;
|
||||||
if (city.cityName.equals("Perdition") || city.cityName.equals("Bastion"))
|
Integer nationUUID = playerCharacter.guild.getNation().getObjectUUID();
|
||||||
continue;
|
boolean allowed = false;
|
||||||
|
if (city.getTOL().reverseKOS) {
|
||||||
// These cities are available for anyone off noob island
|
//reverse KOS, specific values are allowed
|
||||||
|
if (city.getTOL().getCondemned().contains(playerUUID) && city.getTOL().getCondemned().get(playerUUID).active) {
|
||||||
if (playerCharacter.level >= 20 && (city.cityName.equals("Sea Dog's Rest") || city.cityName.equals("Khan'Ov Srekel") || city.cityName.equals("City of Khar Th'Sekt"))) {
|
//individual is cleared for teleport/repledge
|
||||||
cities.add(city);
|
allowed = true;
|
||||||
continue;
|
} else if (city.getTOL().getCondemned().contains(guildUUID) && city.getTOL().getCondemned().get(guildUUID).active) {
|
||||||
}
|
//player guild is cleared for teleport/repledge
|
||||||
|
allowed = true;
|
||||||
// Add Lore cities
|
} else if (city.getTOL().getCondemned().contains(nationUUID) && city.getTOL().getCondemned().get(nationUUID).active) {
|
||||||
|
//player nation is cleared for teleport/repledge
|
||||||
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
|
allowed = true;
|
||||||
|
}
|
||||||
if (repledge) {
|
} else {
|
||||||
if (city.getGuild().charter.canJoin(playerCharacter))
|
//not reverse KOS, everyone is allowed by default
|
||||||
|
allowed = true;
|
||||||
|
//specific values are not allowed
|
||||||
|
if (city.getTOL().getCondemned().contains(playerUUID) && city.getTOL().getCondemned().get(playerUUID).active) {
|
||||||
|
//individual is cleared for teleport/repledge
|
||||||
|
allowed = false;
|
||||||
|
} else if (city.getTOL().getCondemned().contains(guildUUID) && city.getTOL().getCondemned().get(guildUUID).active) {
|
||||||
|
//player guild is cleared for teleport/repledge
|
||||||
|
allowed = false;
|
||||||
|
} else if (city.getTOL().getCondemned().contains(nationUUID) && city.getTOL().getCondemned().get(nationUUID).active) {
|
||||||
|
//player nation is cleared for teleport/repledge
|
||||||
|
allowed = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (allowed) {
|
||||||
cities.add(city);
|
cities.add(city);
|
||||||
} else if (city.getGuild().charter.equals(playerCharacter.guild.charter))
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
|
||||||
|
// Filter NPC cities
|
||||||
|
|
||||||
|
if (city.isNoobIsle == 1) {
|
||||||
|
|
||||||
|
if (playerCharacter.level < 20)
|
||||||
|
cities.add(city); // everyone can go to noob island if they are under level 20
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Players cannot teleport to perdition or bastion
|
||||||
|
|
||||||
|
if (city.cityName.equals("Perdition") || city.cityName.equals("Bastion"))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
// These cities are available for anyone off noob island
|
||||||
|
|
||||||
|
if (playerCharacter.level >= 20 && (city.cityName.equals("Sea Dog's Rest") || city.cityName.equals("Khan'Ov Srekel") || city.cityName.equals("City of Khar Th'Sekt"))) {
|
||||||
cities.add(city);
|
cities.add(city);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add Lore cities
|
||||||
|
|
||||||
|
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
|
||||||
|
|
||||||
|
if (repledge) {
|
||||||
|
if (city.getGuild().charter.canJoin(playerCharacter))
|
||||||
|
cities.add(city);
|
||||||
|
} else if (city.getGuild().charter.equals(playerCharacter.guild.charter))
|
||||||
|
cities.add(city);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return cities;
|
return cities;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user