monotonic time (match core)

DenizenScript · Apr 21, 2022 · 352d6b2 · 352d6b2
1 parent 6a780ef
commit 352d6b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bungee/BungeeBridge.java b/src/main/java/com/denizenscript/depenizen/bukkit/bungee/BungeeBridge.java
@@ -2,6 +2,7 @@
 
 import com.denizenscript.denizencore.DenizenCore;
 import com.denizenscript.denizencore.scripts.commands.core.AdjustCommand;
+import com.denizenscript.denizencore.utilities.CoreUtilities;
 import com.denizenscript.depenizen.bukkit.Depenizen;
 import com.denizenscript.depenizen.bukkit.bungee.packets.in.*;
 import com.denizenscript.depenizen.bukkit.bungee.packets.out.ControlsProxyCommandPacketOut;
@@ -209,7 +210,7 @@ public void run(ReplaceableTagEvent event) {
             if (!connected) {
                 return;
             }
-            if (System.currentTimeMillis() > lastPacketReceived + 20 * 1000) {
+            if (CoreUtilities.monotonicMillis() > lastPacketReceived + 20 * 1000) {
                 // 20 seconds without a packet = connection lost!
                 handler.fail("Connection time out.");
                 return;

diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/bungee/BungeeClientHandler.java b/src/main/java/com/denizenscript/depenizen/bukkit/bungee/BungeeClientHandler.java
@@ -1,5 +1,6 @@
 package com.denizenscript.depenizen.bukkit.bungee;
 
+import com.denizenscript.denizencore.utilities.CoreUtilities;
 import com.denizenscript.depenizen.bukkit.Depenizen;
 import com.denizenscript.depenizen.bukkit.bungee.packets.out.ControlsProxyCommandPacketOut;
 import com.denizenscript.depenizen.bukkit.bungee.packets.out.ControlsProxyPingPacketOut;
@@ -86,7 +87,7 @@ public void channelActive(ChannelHandlerContext ctx) {
         ctx.writeAndFlush(handshake); // Will release handshake
         Bukkit.getScheduler().scheduleSyncDelayedTask(Depenizen.instance, () -> {
             Debug.log("Depenizen now connected to Bungee server.");
-            BungeeBridge.instance.lastPacketReceived = System.currentTimeMillis();
+            BungeeBridge.instance.lastPacketReceived = CoreUtilities.monotonicMillis();
             BungeeBridge.instance.sendPacket(new MyInfoPacketOut(Bukkit.getPort()));
             BungeeBridge.instance.sendPacket(new ControlsProxyPingPacketOut(BungeeBridge.instance.controlsProxyPing));
             BungeeBridge.instance.sendPacket(new ControlsProxyCommandPacketOut(BungeeBridge.instance.controlsProxyCommand));
@@ -117,7 +118,7 @@ else if (currentStage == Stage.AWAIT_DATA) {
                     return;
                 }
                 try {
-                    BungeeBridge.instance.lastPacketReceived = System.currentTimeMillis();
+                    BungeeBridge.instance.lastPacketReceived = CoreUtilities.monotonicMillis();
                     PacketIn packet = BungeeBridge.instance.packets.get(packetId);
                     packet.process(packetBuffer);
                     currentStage = Stage.AWAIT_HEADER;