NPCs in buildings show correct spawn times and progress

2023-05-07 19:40:38 -05:00
parent 92a0af8dbb
commit 76f3d2599b
2 changed files with 493 additions and 474 deletions
@@ -744,8 +744,9 @@ public class ManageCityAssetsMsg extends ClientNetMsg {

 					if (!npcHire.isAlive()){
 						writer.put((byte) 1); // 1 SHOWs respawning
-						writer.putInt(10); // Seconds in respawn.
-						writer.putInt(20);
+						int respawnRemaining = (int)(((Mob)npcHire).deathTime + ((Mob)npcHire).spawnTime * 1000 - System.currentTimeMillis()) / 1000;
+						writer.putInt(respawnRemaining); // Seconds in respawn remaining.
+						writer.putInt(((Mob)npcHire).spawnTime); // max seconds for respawn
 					}
 					else
 						writer.put((byte)0);