From 1cd09226f60c398805ca826bbcfae804c69dc5bf Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Thu, 25 Jun 2026 17:49:55 +0800 Subject: [PATCH] fixes #152 --- .../leavesmc/leaves/protocol/core/LeavesProtocolManager.java | 3 ++- .../java/org/leavesmc/leaves/protocol/core/ProtocolUtils.java | 2 +- .../leaves/protocol/servux/ServuxStructuresProtocol.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/LeavesProtocolManager.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/LeavesProtocolManager.java index bb20d7a..78d6583 100644 --- a/lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/LeavesProtocolManager.java +++ b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/LeavesProtocolManager.java @@ -295,7 +295,8 @@ public class LeavesProtocolManager { } public static void handleTick() { - long currentTime = System.currentTimeMillis() / MinecraftServer.getServer().tickRateManager().nanosecondsPerTick(); + float interval = MinecraftServer.getServer().tickRateManager().millisecondsPerTick(); + long currentTime = interval >= 1 ? System.currentTimeMillis() / (long) MinecraftServer.getServer().tickRateManager().millisecondsPerTick() : (long) (System.currentTimeMillis() / MinecraftServer.getServer().tickRateManager().millisecondsPerTick()); if (currentTime == lastAcceptTime) return; lastAcceptTime = currentTime; for (var tickerInfo : TICKERS) { diff --git a/lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/ProtocolUtils.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/ProtocolUtils.java index 561dbc5..80e973e 100644 --- a/lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/ProtocolUtils.java +++ b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/core/ProtocolUtils.java @@ -46,7 +46,7 @@ public class ProtocolUtils { private static final byte[] EMPTY = new byte[0]; public static String buildProtocolVersion(String protocol) { - return protocol + "-leaves-" + ServerBuildInfo.buildInfo().asString(ServerBuildInfo.StringRepresentation.VERSION_SIMPLE); + return protocol + "-lophine-" + ServerBuildInfo.buildInfo().asString(ServerBuildInfo.StringRepresentation.VERSION_SIMPLE); } public static void sendEmptyPacket(ServerPlayer player, Identifier id) { diff --git a/lophine-server/src/main/java/org/leavesmc/leaves/protocol/servux/ServuxStructuresProtocol.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/servux/ServuxStructuresProtocol.java index 9365891..3dcdcec 100644 --- a/lophine-server/src/main/java/org/leavesmc/leaves/protocol/servux/ServuxStructuresProtocol.java +++ b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/servux/ServuxStructuresProtocol.java @@ -345,7 +345,8 @@ public class ServuxStructuresProtocol implements LeavesProtocol { PACKET_C2S_STRUCTURES_UNREGISTER(4), PACKET_S2C_STRUCTURE_DATA_START(5), PACKET_S2C_SPAWN_METADATA(10), - PACKET_C2S_REQUEST_SPAWN_METADATA(11); + PACKET_C2S_REQUEST_SPAWN_METADATA(11), + PACKET_S2C_WEATHER_DATA(12); public final int type;