wild mob naes and world NPC names corrected

This commit is contained in:
2023-04-30 16:19:53 -05:00
parent d4e7a6691c
commit 9fefebd4a3
2 changed files with 4 additions and 1 deletions
+3
View File
@@ -255,6 +255,9 @@ public class Mob extends AbstractIntelligenceAgent {
this.notEnemy = EnumBitSet.asEnumBitSet(rs.getLong("notEnemy"), Enum.MonsterType.class);
this.enemy = EnumBitSet.asEnumBitSet(rs.getLong("enemy"), Enum.MonsterType.class);
this.firstName = rs.getString("mob_name");
if(this.firstName.isEmpty()){
this.firstName = this.mobBase.getFirstName();
}
if (this.contract != null) {
this.equipmentSetID = this.contract.getEquipmentSet();
this.lastName = this.getContract().getName();
+1 -1
View File
@@ -240,7 +240,7 @@ public class NPC extends AbstractCharacter {
submitUpgradeJob();
this.name = rs.getString("npc_name");
if(this.building != null && this.building.getOwner() != null){
if(this.building != null && this.building.getOwner().getObjectType().equals(GameObjectType.PlayerCharacter)){
this.name += " the " + this.contract.getName();
}