|
|
@ -322,7 +322,7 @@ public class City extends AbstractWorldObject { |
|
|
|
if (city.open && city.getTOL() != null && city.getTOL().getRank() > 4) { |
|
|
|
if (city.open && city.getTOL() != null && city.getTOL().getRank() > 4) { |
|
|
|
|
|
|
|
|
|
|
|
if (!BuildingManager.IsPlayerHostile(city.getTOL(), pc)) { |
|
|
|
if (!BuildingManager.IsPlayerHostile(city.getTOL(), pc)) { |
|
|
|
if (ConfigManager.MB_RULESET.getValue() == "LORE") { |
|
|
|
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) { |
|
|
|
if (city.getGuild().getGuildType().equals(pc.guild.getGuildType())) { |
|
|
|
if (city.getGuild().getGuildType().equals(pc.guild.getGuildType())) { |
|
|
|
cities.add(city); |
|
|
|
cities.add(city); |
|
|
|
} |
|
|
|
} |
|
|
@ -343,20 +343,20 @@ public class City extends AbstractWorldObject { |
|
|
|
if (city.isNpc == 1) |
|
|
|
if (city.isNpc == 1) |
|
|
|
if (city.isNoobIsle == 1) { |
|
|
|
if (city.isNoobIsle == 1) { |
|
|
|
if (pc.getLevel() < 21) |
|
|
|
if (pc.getLevel() < 21) |
|
|
|
if (ConfigManager.MB_RULESET.getValue() == "LORE" && city.getGuild().getGuildType().canJoin(pc)) { |
|
|
|
if (ConfigManager.MB_RULESET.getValue().equals("LORE") && city.getGuild().getGuildType().canJoin(pc)) { |
|
|
|
cities.add(city); |
|
|
|
cities.add(city); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
cities.add(city); //verify nation or guild is same
|
|
|
|
cities.add(city); //verify nation or guild is same
|
|
|
|
} |
|
|
|
} |
|
|
|
} else if (pc.getLevel() > 9) |
|
|
|
} else if (pc.getLevel() > 9) |
|
|
|
if (ConfigManager.MB_RULESET.getValue() == "LORE" && city.getGuild().getGuildType().canJoin(pc)) { |
|
|
|
if (ConfigManager.MB_RULESET.getValue().equals("LORE") && city.getGuild().getGuildType().canJoin(pc)) { |
|
|
|
cities.add(city); |
|
|
|
cities.add(city); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
cities.add(city); //verify nation or guild is same
|
|
|
|
cities.add(city); //verify nation or guild is same
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} else if (pc.getLevel() >= g.getTeleportMin() && pc.getLevel() <= g.getTeleportMax()) |
|
|
|
} else if (pc.getLevel() >= g.getTeleportMin() && pc.getLevel() <= g.getTeleportMax()) |
|
|
|
if (ConfigManager.MB_RULESET.getValue() == "LORE") { |
|
|
|
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) { |
|
|
|
if (city.getGuild().getGuildType().equals(pc.guild.getGuildType())) { |
|
|
|
if (city.getGuild().getGuildType().equals(pc.guild.getGuildType())) { |
|
|
|
cities.add(city); |
|
|
|
cities.add(city); |
|
|
|
} |
|
|
|
} |
|
|
@ -415,13 +415,13 @@ public class City extends AbstractWorldObject { |
|
|
|
if (city.isNpc == 1) |
|
|
|
if (city.isNpc == 1) |
|
|
|
if (city.isNoobIsle == 1) { |
|
|
|
if (city.isNoobIsle == 1) { |
|
|
|
if (playerCharacter.getLevel() < 21) |
|
|
|
if (playerCharacter.getLevel() < 21) |
|
|
|
if (ConfigManager.MB_RULESET.getValue() == "LORE" && city.getGuild().getGuildType().canJoin(playerCharacter)) { |
|
|
|
if (ConfigManager.MB_RULESET.getValue().equals("LORE") && city.getGuild().getGuildType().canJoin(playerCharacter)) { |
|
|
|
cities.add(city); |
|
|
|
cities.add(city); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
cities.add(city); //verify nation or guild is same
|
|
|
|
cities.add(city); //verify nation or guild is same
|
|
|
|
} |
|
|
|
} |
|
|
|
} else if (playerCharacter.getLevel() > 9) |
|
|
|
} else if (playerCharacter.getLevel() > 9) |
|
|
|
if (ConfigManager.MB_RULESET.getValue() == "LORE") { |
|
|
|
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) { |
|
|
|
if (city.getGuild().getGuildType().equals(playerCharacter.guild.getGuildType())) { |
|
|
|
if (city.getGuild().getGuildType().equals(playerCharacter.guild.getGuildType())) { |
|
|
|
cities.add(city); |
|
|
|
cities.add(city); |
|
|
|
} |
|
|
|
} |
|
|
@ -430,7 +430,7 @@ public class City extends AbstractWorldObject { |
|
|
|
} |
|
|
|
} |
|
|
|
} else if (playerCharacter.getLevel() >= guild.getRepledgeMin() && playerCharacter.getLevel() <= guild.getRepledgeMax()) { |
|
|
|
} else if (playerCharacter.getLevel() >= guild.getRepledgeMin() && playerCharacter.getLevel() <= guild.getRepledgeMax()) { |
|
|
|
|
|
|
|
|
|
|
|
if (ConfigManager.MB_RULESET.getValue() == "LORE") { |
|
|
|
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) { |
|
|
|
if (city.getGuild().getGuildType().equals(playerCharacter.guild.getGuildType())) { |
|
|
|
if (city.getGuild().getGuildType().equals(playerCharacter.guild.getGuildType())) { |
|
|
|
cities.add(city); |
|
|
|
cities.add(city); |
|
|
|
} |
|
|
|
} |
|
|
|