NPC have names and contract names

src/engine/net/client/msg/ManageCityAssetsMsg.java

@@ -695,11 +695,7 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
 						writer.putInt(npcHire.getObjectUUID());
 					if (npcHire.getObjectType() == GameObjectType.NPC) {
 						writer.putString(((NPC) npcHire).getContract().getName());
-						if (((NPC) npcHire).getNameOverride().length() > 0) {
+						writer.putString(npcHire.getName());
-							writer.putString(((Mob) npcHire).getNameOverride());
-						} else {
-							writer.putString(npcHire.getName());
-						}
 					}
 					else if (npcHire.getObjectType() == GameObjectType.Mob) {
 						writer.putString(((Mob) npcHire).getContract().getName());

src/engine/objects/NPC.java

@@ -280,7 +280,7 @@ public class NPC extends AbstractCharacter {
 
 
 
-			this.nameOverride = rs.getString("npc_name");
+			this.nameOverride = rs.getString("npc_name") + " the " + this.getContract().getName();
 
 		}catch(Exception e){
 			Logger.error(e);