FatBoy/lakebane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

More logic work

Browse Source
This commit is contained in:
MagicBot
2024-06-19 17:49:46 -04:00
parent 141af19daa
commit fff1e80f61
1 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/City.java
+17 -12
View File
@@ -344,29 +344,34 @@ public class City extends AbstractWorldObject {
// Filter NPC cities
if (city.isNoobIsle == 1 && playerCharacter.level <= 20) {
if (city.isNoobIsle == 1 && 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; // cannot teleport to perdition or bastion
// Filter Lore cities
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
if (!repledge)
if (!city.getGuild().charter.equals(playerCharacter.guild.charter))
continue;
if (repledge)
if (!city.getGuild().charter.canJoin(playerCharacter))
// 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);
continue;
}
if (city.isNpc == 1)
// 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;