From 8ff06b120014e142691615de69362d6446d7ccd4 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Tue, 4 Jun 2024 21:15:45 -0500 Subject: [PATCH] guild lookup no lonkger retursn null, return ErrantGuild --- src/engine/objects/City.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engine/objects/City.java b/src/engine/objects/City.java index 2659a449..68a588c6 100644 --- a/src/engine/objects/City.java +++ b/src/engine/objects/City.java @@ -639,17 +639,17 @@ public class City extends AbstractWorldObject { public Guild getGuild() { if (this.getTOL() == null) - return null; + return Guild.getErrantGuild(); if (this.isNpc == 1) { if (this.getTOL().getOwner() == null) - return null; + return Guild.getErrantGuild(); return this.getTOL().getOwner().getGuild(); } else { if (this.getTOL().getOwner() == null) - return null; + return Guild.getErrantGuild(); return this.getTOL().getOwner().getGuild(); } }