Browse Source

Never null

postwipe-guilds
MagicBot 5 months ago
parent
commit
ede016a93d
  1. 11
      src/engine/objects/City.java

11
src/engine/objects/City.java

@ -640,20 +640,13 @@ public class City extends AbstractWorldObject {
public Guild getGuild() { public Guild getGuild() {
if (this.getTOL() == null) if (this.getTOL() == null)
return null; return Guild.getErrantGuild();
if (this.isNpc == 1) {
if (this.getTOL().getOwner() == null) if (this.getTOL().getOwner() == null)
return null; return Guild.getErrantGuild();
return this.getTOL().getOwner().getGuild();
} else {
if (this.getTOL().getOwner() == null)
return null;
return this.getTOL().getOwner().getGuild(); return this.getTOL().getOwner().getGuild();
} }
}
public boolean openCity(boolean open) { public boolean openCity(boolean open) {

Loading…
Cancel
Save