Cleanup of cityChoice handler

2024-06-19 15:05:01 -04:00
parent 5224c79441
commit 8a3e39e97d
2 changed files with 42 additions and 54 deletions
@@ -193,12 +193,16 @@ public class Guild extends AbstractWorldObject {
    }

    public static boolean sameNationExcludeErrant(Guild a, Guild b) {
+
        if (a == null || b == null)
            return false;
+
        if (a.getObjectUUID() == b.getObjectUUID())
            return true;
+
        if (a.nation == null || b.nation == null)
            return false;
+
        return a.nation.getObjectUUID() == b.nation.getObjectUUID() && !a.nation.isEmptyGuild();
    }