Browse Source

Method cleanup.

postwipe-1.5.2
MagicBot 5 months ago
parent
commit
e79da63556
  1. 15
      src/engine/objects/City.java

15
src/engine/objects/City.java

@ -306,15 +306,16 @@ public class City extends AbstractWorldObject {
if (city.parentZone == null) if (city.parentZone == null)
continue; continue;
if(repledge && city.getGuild().equals(playerCharacter.guild)){ //can't repledge to a guild you're already part of
//can't repledge to a guild you're already part of
if (repledge && city.getGuild().equals(playerCharacter.guild))
continue; continue;
}
if (city.parentZone.guild_zone) { if (city.parentZone.guild_zone) {
//players can all port and repledge inside their own nation
if(city.getGuild().getNation().equals(playerCharacter.guild.getNation())){ if(city.getGuild().getNation().equals(playerCharacter.guild.getNation())){
//players can all port and repledge inside their own nation
cities.add(city); cities.add(city);
continue; continue;
} }
@ -325,10 +326,10 @@ public class City extends AbstractWorldObject {
if (ConfigManager.MB_RULESET.getValue().equals("LORE")) { if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
if (!repledge) if (repledge) {
if (!city.getGuild().charter.equals(playerCharacter.guild.charter)) if (!city.getGuild().charter.canJoin(playerCharacter))
continue; continue;
else if (!city.getGuild().charter.canJoin(playerCharacter)) } else if (!city.getGuild().charter.equals(playerCharacter.guild.charter))
continue; continue;
} }

Loading…
Cancel
Save