getCity() updated for object

2023-10-23 05:45:03 -04:00
parent 6484e7eb93
commit 134838072d
1 changed files with 1 additions and 24 deletions
@@ -287,30 +287,7 @@ public class Building extends AbstractWorldObject {
    public final City getCity() {
-        if (this.parentZone == null)
+        return ZoneManager.getCityAtLocation(this.getLoc());
            return null;
        if (this.getBlueprint() != null && this.getBlueprint().isSiegeEquip() && this.protectionState.equals(ProtectionState.PROTECTED)) {
            if (this.getGuild() != null) {
                if (this.getGuild().getOwnedCity() != null) {
                    if (this.getLoc().isInsideCircle(this.getGuild().getOwnedCity().getLoc(), CityBoundsType.ZONE.halfExtents))
                        return this.getGuild().getOwnedCity();
                } else {
                    Bane bane = Bane.getBaneByAttackerGuild(this.getGuild());
                    if (bane != null) {
                        if (bane.getCity() != null) {
                            if (this.getLoc().isInsideCircle(bane.getCity().getLoc(), CityBoundsType.ZONE.halfExtents))
                                return bane.getCity();
                        }
                    }
                }
            }
        }
        if (this.parentZone.guild_zone == false)
            return null;
        return City.getCity(this.parentZone.playerCityUUID);
    }