Browse Source

Lore check for telport and repledge

combat-2
FatBoy-DOTC 7 months ago
parent
commit
f4bd928796
  1. 12
      src/engine/objects/City.java

12
src/engine/objects/City.java

@ -343,9 +343,17 @@ 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)) {
cities.add(city); cities.add(city);
} else {
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)) {
cities.add(city); cities.add(city);
} else {
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() == "LORE") {
@ -407,7 +415,11 @@ 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)) {
cities.add(city);
} 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() == "LORE") {
if (city.getGuild().getGuildType().equals(playerCharacter.guild.getGuildType())) { if (city.getGuild().getGuildType().equals(playerCharacter.guild.getGuildType())) {

Loading…
Cancel
Save