wild mob naes and world NPC names corrected
This commit is contained in:
@@ -255,6 +255,9 @@ public class Mob extends AbstractIntelligenceAgent {
|
|||||||
this.notEnemy = EnumBitSet.asEnumBitSet(rs.getLong("notEnemy"), Enum.MonsterType.class);
|
this.notEnemy = EnumBitSet.asEnumBitSet(rs.getLong("notEnemy"), Enum.MonsterType.class);
|
||||||
this.enemy = EnumBitSet.asEnumBitSet(rs.getLong("enemy"), Enum.MonsterType.class);
|
this.enemy = EnumBitSet.asEnumBitSet(rs.getLong("enemy"), Enum.MonsterType.class);
|
||||||
this.firstName = rs.getString("mob_name");
|
this.firstName = rs.getString("mob_name");
|
||||||
|
if(this.firstName.isEmpty()){
|
||||||
|
this.firstName = this.mobBase.getFirstName();
|
||||||
|
}
|
||||||
if (this.contract != null) {
|
if (this.contract != null) {
|
||||||
this.equipmentSetID = this.contract.getEquipmentSet();
|
this.equipmentSetID = this.contract.getEquipmentSet();
|
||||||
this.lastName = this.getContract().getName();
|
this.lastName = this.getContract().getName();
|
||||||
|
|||||||
@@ -240,7 +240,7 @@ 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() != null){
|
if(this.building != null && this.building.getOwner().getObjectType().equals(GameObjectType.PlayerCharacter)){
|
||||||
this.name += " the " + this.contract.getName();
|
this.name += " the " + this.contract.getName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user