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

Naming update.

Browse Source
This commit is contained in:
MagicBot
2023-04-30 10:55:16 -04:00
parent b5e2848091
commit eee949de93
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Mob.java
+5 -3
View File
@@ -231,7 +231,8 @@ public class Mob extends AbstractIntelligenceAgent {
java.util.Date sqlDateTime; java.util.Date sqlDateTime;
sqlDateTime = rs.getTimestamp("upgradeDate"); sqlDateTime = rs.getTimestamp("upgradeDate");
if (sqlDateTime != null) upgradeDateTime = new DateTime(sqlDateTime); if (sqlDateTime != null)
upgradeDateTime = new DateTime(sqlDateTime);
else upgradeDateTime = null; else upgradeDateTime = null;
// Submit upgrade job if NPC is currently set to rank. // Submit upgrade job if NPC is currently set to rank.
@@ -242,7 +243,8 @@ public class Mob extends AbstractIntelligenceAgent {
this.setObjectTypeMask(MBServerStatics.MASK_MOB | this.getTypeMasks()); this.setObjectTypeMask(MBServerStatics.MASK_MOB | this.getTypeMasks());
if (this.mobBase != null && this.spawnTime == 0) this.spawnTime = this.mobBase.getSpawnTime(); if (this.mobBase != null && this.spawnTime == 0)
this.spawnTime = this.mobBase.getSpawnTime();
this.bindLoc = new Vector3fImmutable(this.statLat, this.statAlt, this.statLon); this.bindLoc = new Vector3fImmutable(this.statLat, this.statAlt, this.statLon);
@@ -254,7 +256,7 @@ public class Mob extends AbstractIntelligenceAgent {
if (this.contract != null) { if (this.contract != null) {
this.equipmentSetID = this.contract.getEquipmentSet(); this.equipmentSetID = this.contract.getEquipmentSet();
this.nameOverride = rs.getString("mob_name") + " the " + this.getContract().getName(); this.nameOverride = this.getContract().getName();
} else { } else {
this.equipmentSetID = rs.getInt("equipmentSet"); this.equipmentSetID = rs.getInt("equipmentSet");
this.nameOverride = rs.getString("mob_name"); this.nameOverride = rs.getString("mob_name");
src/engine/objects/NPC.java
+1 -1
View File
@@ -240,7 +240,7 @@ public class NPC extends AbstractCharacter {
if (this.upgradeDateTime != null) if (this.upgradeDateTime != null)
submitUpgradeJob(); submitUpgradeJob();
this.name = rs.getString("npc_name"); this.name = this.contract.getName();
this.nameOverride = rs.getString("npc_name"); this.nameOverride = rs.getString("npc_name");
}catch(Exception e){ }catch(Exception e){