From 6ed648d6d4b514c0e2f0d3c94adee9394ec1f94a Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Wed, 12 Feb 2025 17:14:04 -0600
Subject: [PATCH] catch weird city null error

---
 src/engine/objects/City.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/engine/objects/City.java b/src/engine/objects/City.java
index 48551a82..ad6b3f93 100644
--- a/src/engine/objects/City.java
+++ b/src/engine/objects/City.java
@@ -395,8 +395,14 @@ public class City extends AbstractWorldObject {
                         //open city, just list
                         if (city.open && city.getTOL() != null && city.getTOL().getRank() > 4) {
                             cities.add(city);
-                        }else if(city.getGuild().getNation().equals(pc.guild.getNation())){
-                            cities.add(city);
+                        }else {
+                            try {
+                                if (city.getGuild().getNation().equals(pc.guild.getNation())) {
+                                    cities.add(city);
+                                }
+                            }catch(Exception e){
+                                Logger.error(e);
+                            }
                         }
                     }
                 } else if (city.isNpc == 1) {