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

trebs now show correct time remaining to spawn

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-05-27 22:00:12 -05:00
parent 0d2af7c011
commit 0de09ee9f5
1 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/msg/ManageNPCMsg.java
+35 -11
View File
@@ -465,18 +465,42 @@ public class ManageNPCMsg extends ClientNetMsg {
writer.putInt(0);
writer.putInt(1);
writer.putInt(1);
writer.put((byte) 0);
long curTime = System.currentTimeMillis() / 1000;
long upgradeTime = mob.getTimeToSpawnSiege() / 1000;
long timeLife = upgradeTime - curTime;
writer.putInt(900);
writer.putInt(900);
writer.putInt((int) timeLife); //time remaining?
writer.putInt(0);
writer.put((byte) 0);
writer.putString(mob.getName());
writer.put((byte) 0);
long curTime = System.currentTimeMillis() / 1000;
long upgradeTime = (mob.deathTime + (mob.spawnTime * 1000)) / 1000;
long timeLife = upgradeTime - curTime;
if (upgradeTime * 1000 > System.currentTimeMillis()) {
if(mob.npcOwner.isAlive()) {
writer.put((byte) 0);//shows respawning timer
writer.putInt(mob.spawnTime);
writer.putInt(mob.spawnTime);
writer.putInt((int) timeLife); //time remaining for mob that is dead
writer.putInt(0);
writer.put((byte) 0);
writer.putString(mob.getNameOverride().isEmpty() ? mob.getName() : mob.getNameOverride());
writer.put((byte) 0);
}
else{
writer.put((byte) 0);//shows respawning timer
writer.putInt(0);
writer.putInt(0);
writer.putInt(0); //time remaining for mob that is dead
writer.putInt(0);
writer.put((byte) 0);
writer.putString(mob.getNameOverride().isEmpty() ? mob.getName() : mob.getNameOverride());
writer.put((byte) 0);
}
} else {
//nothing required for countdown for a mob that is alive
writer.put((byte) 1);//shows "Standing By"
writer.putInt(0);
writer.putInt(0);
writer.putInt(0);
writer.putInt(0);
writer.put((byte) 0);
writer.putString(mob.getNameOverride().isEmpty() ? mob.getName() : mob.getNameOverride());
writer.put((byte) 0);
}
}
return;