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

Mobile implements Delayed interface

Browse Source
This commit is contained in:
MagicBot
2023-10-23 00:07:48 -04:00
parent 7b70b680f0
commit 8bd406bcf4
5 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/msg/ManageCityAssetsMsg.java
+2 -2
View File
@@ -727,9 +727,9 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
if (!npcHire.isAlive()) {
writer.put((byte) 1); // 1 SHOWs respawning
int respawnRemaining = (int) (((Mob) npcHire).deathTime + ((Mob) npcHire).spawnTime * 1000 - System.currentTimeMillis()) / 1000;
int respawnRemaining = (int) (((Mob) npcHire).deathTime + ((Mob) npcHire).spawnDelay * 1000 - System.currentTimeMillis()) / 1000;
writer.putInt(respawnRemaining); // Seconds in respawn remaining.
writer.putInt(((Mob) npcHire).spawnTime); // max seconds for respawn
writer.putInt(((Mob) npcHire).spawnDelay); // max seconds for respawn
} else
writer.put((byte) 0);
src/engine/net/client/msg/ManageNPCMsg.java
+6 -6
View File
@@ -364,14 +364,14 @@ public class ManageNPCMsg extends ClientNetMsg {
writer.putInt(1);
long curTime = System.currentTimeMillis() / 1000;
long upgradeTime = (mob.deathTime + (mob.spawnTime * 1000)) / 1000;
long upgradeTime = (mob.deathTime + (mob.spawnDelay * 1000)) / 1000;
long timeLife = upgradeTime - curTime;
if (upgradeTime * 1000 > System.currentTimeMillis()) {
if (mob.guardCaptain.isAlive()) {
writer.put((byte) 0);//shows respawning timer
writer.putInt(mob.spawnTime);
writer.putInt(mob.spawnTime);
writer.putInt(mob.spawnDelay);
writer.putInt(mob.spawnDelay);
writer.putInt((int) timeLife); //time remaining for mob that is dead
writer.putInt(0);
writer.put((byte) 0);
@@ -688,14 +688,14 @@ public class ManageNPCMsg extends ClientNetMsg {
writer.putInt(1);
long curTime = System.currentTimeMillis() / 1000;
long upgradeTime = (mob.deathTime + (mob.spawnTime * 1000)) / 1000;
long upgradeTime = (mob.deathTime + (mob.spawnDelay * 1000)) / 1000;
long timeLife = upgradeTime - curTime;
if (upgradeTime * 1000 > System.currentTimeMillis()) {
if (mob.guardCaptain.isAlive()) {
writer.put((byte) 0);//shows respawning timer
writer.putInt(mob.spawnTime);
writer.putInt(mob.spawnTime);
writer.putInt(mob.spawnDelay);
writer.putInt(mob.spawnDelay);
writer.putInt((int) timeLife); //time remaining for mob that is dead
writer.putInt(0);
writer.put((byte) 0);