MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

proper NPC names in asset management window

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-04-22 22:44:13 -05:00
parent c02c5750c6
commit 83eab27a90
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/msg/ManageCityAssetsMsg.java
+21 -8
View File
@@ -274,9 +274,10 @@ 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());
else else
writer.putString(((Mob)npcHire).getContract().getName()); writer.putString("Guard Captain");
//writer.putString("Guard Captain");
writer.putString(npcHire.getName()); writer.putString(npcHire.getName());
writer.putInt(1); writer.putInt(1);
writer.putInt(Blueprint.getNpcMaintCost(npcHire.getRank())); writer.putInt(Blueprint.getNpcMaintCost(npcHire.getRank()));
@@ -692,11 +693,23 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
writer.putInt(((Mob)npcHire).getDBID()); writer.putInt(((Mob)npcHire).getDBID());
else else
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());
else if (((NPC) npcHire).getNameOverride().length() > 0) {
writer.putString("Guard Captain"); writer.putString(((Mob) npcHire).getNameOverride());
writer.putString(npcHire.getName()); } else {
writer.putString(npcHire.getName());
}
}
else if (npcHire.getObjectType() == GameObjectType.Mob) {
writer.putString(((Mob) npcHire).getContract().getName());
if (((Mob) npcHire).getNameOverride().length() > 0) {
writer.putString(((Mob) npcHire).getNameOverride());
} else {
writer.putString(npcHire.getName());
}
}else
writer.putString("Error: Nothing Here");
writer.putInt(npcHire.getRank()); writer.putInt(npcHire.getRank());
writer.putInt(Blueprint.getNpcMaintCost(npcHire.getRank())); writer.putInt(Blueprint.getNpcMaintCost(npcHire.getRank()));
if (npcHire.getObjectType() == GameObjectType.NPC) if (npcHire.getObjectType() == GameObjectType.NPC)