FatBoy/lakebane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Tweak to name derivation in constructor

Browse Source
This commit is contained in:
MagicBot
2023-04-29 16:32:12 -04:00
parent a3217f44be
commit 4365fafb77
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/NPC.java
+8 -11
View File
@@ -190,17 +190,9 @@ public class NPC extends AbstractCharacter {
this.mobBase = MobBase.getMobBase(this.loadID);
this.level = rs.getByte("npc_level");
this.isMob = false;
int buildingID = rs.getInt("npc_buildingID");
try{
this.building = BuildingManager.getBuilding(buildingID);
}catch(Exception e){
this.building = null;
Logger.error( e.getMessage());
}
this.name = rs.getString("npc_name");
this.building = BuildingManager.getBuilding(buildingID);
// Most objects from the cache have a default buy
// percentage of 100% which was a dupe source due
@@ -247,11 +239,16 @@ public class NPC extends AbstractCharacter {
if (this.upgradeDateTime != null)
submitUpgradeJob();
if (this.contract != null)
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");
}catch(Exception e){
Logger.error(e);
e.printStackTrace();