Browse Source

fix for player guild checks

combat-2
FatBoy-DOTC 8 months ago
parent
commit
8bbaae418d
  1. 6
      src/engine/objects/City.java

6
src/engine/objects/City.java

@ -357,7 +357,7 @@ public class City extends AbstractWorldObject {
} 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().equals("LORE")) { if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
if (city.getGuild().getGuildType().equals(pc.guild.getGuildType())) { if (city.getGuild().getGuildType().canJoin(pc)) {
cities.add(city); cities.add(city);
} }
} else { } else {
@ -422,7 +422,7 @@ public class City extends AbstractWorldObject {
} }
} else if (playerCharacter.getLevel() > 9) } else if (playerCharacter.getLevel() > 9)
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) { if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
if (city.getGuild().getGuildType().equals(playerCharacter.guild.getGuildType())) { if (city.getGuild().getGuildType().canJoin(playerCharacter)) {
cities.add(city); cities.add(city);
} }
} else { } else {
@ -431,7 +431,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().equals("LORE")) { if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
if (city.getGuild().getGuildType().equals(playerCharacter.guild.getGuildType())) { if (city.getGuild().getGuildType().canJoin(playerCharacter)) {
cities.add(city); cities.add(city);
} }
} else { } else {

Loading…
Cancel
Save