|
|
@ -240,9 +240,13 @@ public class NPC extends AbstractCharacter { |
|
|
|
submitUpgradeJob(); |
|
|
|
submitUpgradeJob(); |
|
|
|
|
|
|
|
|
|
|
|
this.name = rs.getString("npc_name"); |
|
|
|
this.name = rs.getString("npc_name"); |
|
|
|
if(this.building != null && this.building.getOwner().getObjectType().equals(GameObjectType.PlayerCharacter)){ |
|
|
|
|
|
|
|
|
|
|
|
// Name override for player owned npcs
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (this.building != null && |
|
|
|
|
|
|
|
this.building.getOwner() != null && |
|
|
|
|
|
|
|
this.building.getOwner().getObjectType().equals(GameObjectType.PlayerCharacter)) |
|
|
|
this.name += " the " + this.contract.getName(); |
|
|
|
this.name += " the " + this.contract.getName(); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}catch(Exception e){ |
|
|
|
}catch(Exception e){ |
|
|
|
Logger.error(e); |
|
|
|
Logger.error(e); |
|
|
|