Never null

2024-06-19 14:43:31 -04:00
parent cc1825dec9
commit ede016a93d
1 changed files with 4 additions and 11 deletions
@@ -640,20 +640,13 @@ public class City extends AbstractWorldObject {
    public Guild getGuild() {

        if (this.getTOL() == null)
-            return null;
-
-        if (this.isNpc == 1) {
+            return Guild.getErrantGuild();

        if (this.getTOL().getOwner() == null)
-                return null;
-            return this.getTOL().getOwner().getGuild();
-        } else {
+            return Guild.getErrantGuild();

-            if (this.getTOL().getOwner() == null)
-                return null;
        return this.getTOL().getOwner().getGuild();
    }
-    }

    public boolean openCity(boolean open) {