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

Complete JodaTime -> java.time migration (remaining objects, db handlers, net msg, jobs) + QC pass; untrack working reference files

Browse Source
This commit is contained in:
SlaveOfMagicbot committed 2026-10-05 23:01:19 -05:00
1 parent efd35e89f1
commit 93eb77fcc8
26 files changed
+160 -426
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/engine/net/client/msg/ManageNPCMsg.java
+21 -22
View File
@@ -19,9 +19,6 @@ import engine.net.ByteBufferWriter;
import engine.net.client.Protocol;
import engine.objects.*;
import engine.powers.EffectsBase;
import org.joda.time.DateTime;
import org.joda.time.Period;
import org.joda.time.Seconds;
import org.pmw.tinylog.Logger;
import java.util.ArrayList;
@@ -140,7 +137,7 @@ public class ManageNPCMsg extends ClientNetMsg {
@Override
protected void _serialize(ByteBufferWriter writer) {
Period upgradePeriod;
java.time.Duration upgradePeriod;
int upgradePeriodInSeconds;
try {
@@ -202,21 +199,22 @@ public class ManageNPCMsg extends ClientNetMsg {
writer.putInt(npc.getUpgradeCost());
if (npc.isRanking() && npc.getUpgradeDateTime().isAfter(DateTime.now()))
upgradePeriod = new Period(DateTime.now(), npc.getUpgradeDateTime());
if (npc.isRanking() && npc.getUpgradeDateTime().isAfter(java.time.Instant.now()))
upgradePeriod = java.time.Duration.between(java.time.Instant.now(), npc.getUpgradeDateTime());
else
upgradePeriod = new Period(0);
upgradePeriod = java.time.Duration.ZERO;
writer.put((byte) upgradePeriod.getDays()); //for timer
long npcUpgradeSec = Math.max(0L, upgradePeriod.getSeconds());
writer.put((byte) (int) (npcUpgradeSec / 86400)); //for timer
writer.put((byte) unknown26);//unknown
writer.putInt(100); //unknown
writer.put((byte) upgradePeriod.getHours()); //for timer
writer.put((byte) upgradePeriod.getMinutes()); //for timer
writer.put((byte) upgradePeriod.getSeconds()); //for timer
writer.put((byte) (int) ((npcUpgradeSec % 86400) / 3600)); //for timer
writer.put((byte) (int) ((npcUpgradeSec % 3600) / 60)); //for timer
writer.put((byte) (int) (npcUpgradeSec % 60); //for timer
if (npc.isRanking() && npc.getUpgradeDateTime().isAfter(DateTime.now()))
upgradePeriodInSeconds = Seconds.secondsBetween(DateTime.now(), npc.getUpgradeDateTime()).getSeconds();
if (npc.isRanking() && npc.getUpgradeDateTime().isAfter(java.time.Instant.now()))
upgradePeriodInSeconds = (int) npcUpgradeSec;
else
upgradePeriodInSeconds = 0;
@@ -610,21 +608,22 @@ public class ManageNPCMsg extends ClientNetMsg {
writer.putInt(Mob.getUpgradeCost(mobA));
if (mobA.isRanking() && mobA.getUpgradeDateTime().isAfter(DateTime.now()))
upgradePeriod = new Period(DateTime.now(), mobA.getUpgradeDateTime());
if (mobA.isRanking() && mobA.getUpgradeDateTime().isAfter(java.time.Instant.now()))
upgradePeriod = java.time.Duration.between(java.time.Instant.now(), mobA.getUpgradeDateTime());
else
upgradePeriod = new Period(0);
upgradePeriod = java.time.Duration.ZERO;
writer.put((byte) upgradePeriod.getDays()); //for timer
long mobUpgradeSec = Math.max(0L, upgradePeriod.getSeconds());
writer.put((byte) (int) (mobUpgradeSec / 86400)); //for timer
writer.put((byte) unknown26);//unknown
writer.putInt(100); //unknown
writer.put((byte) upgradePeriod.getHours()); //for timer
writer.put((byte) upgradePeriod.getMinutes()); //for timer
writer.put((byte) upgradePeriod.getSeconds()); //for timer
writer.put((byte) (int) ((mobUpgradeSec % 86400) / 3600)); //for timer
writer.put((byte) (int) ((mobUpgradeSec % 3600) / 60)); //for timer
writer.put((byte) (int) (mobUpgradeSec % 60); //for timer
if (mobA.isRanking() && mobA.getUpgradeDateTime().isAfter(DateTime.now()))
upgradePeriodInSeconds = Seconds.secondsBetween(DateTime.now(), mobA.getUpgradeDateTime()).getSeconds();
if (mobA.isRanking() && mobA.getUpgradeDateTime().isAfter(java.time.Instant.now()))
upgradePeriodInSeconds = (int) mobUpgradeSec;
else
upgradePeriodInSeconds = 0;