MagicBane
/
Server
92
0
Fork 5
Code Issues 7 Pull Requests Projects Releases Wiki Activity
Browse Source

fix for player guild checks

combat-2
FatBoy-DOTC 2 years ago
parent
10db850de4
commit
8bbaae418d
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/engine/objects/City.java

6
src/engine/objects/City.java
Unescape View File

@ -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 {

Write Preview
Loading…
Cancel
Save