|
|
|
@ -295,14 +295,21 @@ public class City extends AbstractWorldObject {
@@ -295,14 +295,21 @@ public class City extends AbstractWorldObject {
|
|
|
|
|
|
|
|
|
|
ConcurrentHashMap<Integer, AbstractGameObject> worldCities = DbManager.getMap(mbEnums.GameObjectType.City); |
|
|
|
|
|
|
|
|
|
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) { |
|
|
|
|
|
|
|
|
|
//handle compiling of cities able to be teleported to for lore rule-set
|
|
|
|
|
|
|
|
|
|
for (AbstractGameObject ago : worldCities.values()) { |
|
|
|
|
|
|
|
|
|
City city = (City) ago; |
|
|
|
|
|
|
|
|
|
// Filter Lore cities
|
|
|
|
|
|
|
|
|
|
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) { |
|
|
|
|
|
|
|
|
|
if (repledge == false) |
|
|
|
|
if (!city.getGuild().charter.equals(playerCharacter.guild.charter)) |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Filter Player cities
|
|
|
|
|
|
|
|
|
|
if (city.parentZone == null) |
|
|
|
@ -354,7 +361,6 @@ public class City extends AbstractWorldObject {
@@ -354,7 +361,6 @@ public class City extends AbstractWorldObject {
|
|
|
|
|
if (city.isNpc == 1 && city.isNoobIsle == 0 && playerCharacter.level >= 20) |
|
|
|
|
cities.add(city); // Errants can travel everywhere off noob isle.
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return cities; |
|
|
|
|
} |
|
|
|
|