class and table schema now conform to JSON

src/engine/objects/NPC.java

@@ -894,7 +894,7 @@ public class NPC extends AbstractCharacter {
             this.stamina.set(this.staminaMax);
         }
 
-        if (this.parentZone.isPlayerCity)
+        if (this.parentZone.isGuildZone)
             if (NPC.GetNPCProfits(this) == null)
                 NPCProfits.CreateProfits(this);
 
@@ -1192,7 +1192,7 @@ public class NPC extends AbstractCharacter {
             if (serverZone == null)
                 return null;
 
-            city = City.GetCityFromCache(serverZone.playerCityID);
+            city = City.GetCityFromCache(serverZone.playerCityUUID);
 
             if (city == null) {