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

NPC have names and contract names

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-04-22 23:20:24 -05:00
parent 88e09c479f
commit 3e005c3a51
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/msg/ManageCityAssetsMsg.java
+1 -5
View File
@@ -695,11 +695,7 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
writer.putInt(npcHire.getObjectUUID()); writer.putInt(npcHire.getObjectUUID());
if (npcHire.getObjectType() == GameObjectType.NPC) { if (npcHire.getObjectType() == GameObjectType.NPC) {
writer.putString(((NPC) npcHire).getContract().getName()); writer.putString(((NPC) npcHire).getContract().getName());
if (((NPC) npcHire).getNameOverride().length() > 0) { writer.putString(npcHire.getName());
writer.putString(((Mob) npcHire).getNameOverride());
} else {
writer.putString(npcHire.getName());
}
} }
else if (npcHire.getObjectType() == GameObjectType.Mob) { else if (npcHire.getObjectType() == GameObjectType.Mob) {
writer.putString(((Mob) npcHire).getContract().getName()); writer.putString(((Mob) npcHire).getContract().getName());
src/engine/objects/NPC.java
+1 -1
View File
@@ -280,7 +280,7 @@ public class NPC extends AbstractCharacter {
this.nameOverride = rs.getString("npc_name"); this.nameOverride = rs.getString("npc_name") + " the " + this.getContract().getName();
}catch(Exception e){ }catch(Exception e){
Logger.error(e); Logger.error(e);