Never null

This commit is contained in:
2024-06-19 14:43:31 -04:00
parent cc1825dec9
commit ede016a93d
+4 -11
View File
@@ -640,19 +640,12 @@ 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)
return Guild.getErrantGuild();
if (this.getTOL().getOwner() == null) return this.getTOL().getOwner().getGuild();
return null;
return this.getTOL().getOwner().getGuild();
} else {
if (this.getTOL().getOwner() == null)
return null;
return this.getTOL().getOwner().getGuild();
}
} }
public boolean openCity(boolean open) { public boolean openCity(boolean open) {