MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

UUID is in keyset

Browse Source
This commit is contained in:
MagicBot
2024-06-24 03:09:38 -04:00
parent da0510d2bc
commit 533565e37e
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/City.java
+18 -21
View File
@@ -318,6 +318,7 @@ public class City extends AbstractWorldObject {
cities.add(city); cities.add(city);
continue; continue;
} }
if (city.isOpen() && city.getTOL().rank > 4) { if (city.isOpen() && city.getTOL().rank > 4) {
// Filter Lore cities // Filter Lore cities
@@ -330,41 +331,37 @@ public class City extends AbstractWorldObject {
else if (!city.getGuild().charter.canJoin(playerCharacter)) else if (!city.getGuild().charter.canJoin(playerCharacter))
continue; continue;
} }
Integer playerUUID = playerCharacter.objectUUID; Integer playerUUID = playerCharacter.objectUUID;
Integer guildUUID = playerCharacter.guildUUID; Integer guildUUID = playerCharacter.guildUUID;
Integer nationUUID = playerCharacter.guild.getNation().getObjectUUID(); Integer nationUUID = playerCharacter.guild.getNation().getObjectUUID();
boolean allowed = false; boolean allowed = false;
if (city.getTOL().reverseKOS) { if (city.getTOL().reverseKOS) {
//reverse KOS, specific values are allowed //reverse KOS, specific values are allowed
if (city.getTOL().getCondemned().contains(playerUUID) && city.getTOL().getCondemned().get(playerUUID).active) {
//individual is cleared for teleport/repledge if ((city.getTOL().getCondemned().containsKey(playerUUID) && city.getTOL().getCondemned().get(playerUUID).active) ||
(city.getTOL().getCondemned().containsKey(guildUUID) && city.getTOL().getCondemned().get(guildUUID).active) ||
(city.getTOL().getCondemned().containsKey(nationUUID) && city.getTOL().getCondemned().get(nationUUID).active))
allowed = true; 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 { } else {
//not reverse KOS, everyone is allowed by default //not reverse KOS, everyone is allowed by default
allowed = true; allowed = true;
//specific values are not allowed //specific values are not allowed
if (city.getTOL().getCondemned().contains(playerUUID) && city.getTOL().getCondemned().get(playerUUID).active) {
//individual is cleared for teleport/repledge if ((city.getTOL().getCondemned().containsKey(playerUUID) && city.getTOL().getCondemned().get(playerUUID).active) ||
(city.getTOL().getCondemned().containsKey(guildUUID) && city.getTOL().getCondemned().get(guildUUID).active) ||
(city.getTOL().getCondemned().containsKey(nationUUID) && city.getTOL().getCondemned().get(nationUUID).active))
allowed = false; 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) {
if (allowed)
cities.add(city); cities.add(city);
continue;
}
} }
} else { } else {