|
|
@ -240,15 +240,8 @@ public class NPC extends AbstractCharacter { |
|
|
|
submitUpgradeJob(); |
|
|
|
submitUpgradeJob(); |
|
|
|
|
|
|
|
|
|
|
|
this.name = rs.getString("npc_name"); |
|
|
|
this.name = rs.getString("npc_name"); |
|
|
|
|
|
|
|
|
|
|
|
// Zone cache can override contract name
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (this.nameOverride.isEmpty()) |
|
|
|
|
|
|
|
this.nameOverride = rs.getString("npc_name") + " the " + this.getContract().getName(); |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
this.nameOverride = rs.getString("npc_name"); |
|
|
|
this.nameOverride = rs.getString("npc_name"); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}catch(Exception e){ |
|
|
|
}catch(Exception e){ |
|
|
|
Logger.error(e); |
|
|
|
Logger.error(e); |
|
|
|
e.printStackTrace(); |
|
|
|
e.printStackTrace(); |
|
|
|