From 7225edc1d64c98fe13d26edfef8960a9cf47e5df Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Wed, 29 Dec 2021 19:33:37 -0600 Subject: [PATCH] Time-of-day fix for Fabric (all versions) and Forge (1.13-1.16) --- .../src/main/java/org/dynmap/fabric_1_14_4/FabricWorld.java | 2 +- .../src/main/java/org/dynmap/fabric_1_15_2/FabricWorld.java | 2 +- .../src/main/java/org/dynmap/fabric_1_16_4/FabricWorld.java | 2 +- .../src/main/java/org/dynmap/fabric_1_17_1/FabricWorld.java | 2 +- .../src/main/java/org/dynmap/fabric_1_18/FabricWorld.java | 2 +- .../src/main/java/org/dynmap/forge_1_13_2/ForgeWorld.java | 2 +- .../src/main/java/org/dynmap/forge_1_14_4/ForgeWorld.java | 2 +- .../src/main/java/org/dynmap/forge_1_15_2/ForgeWorld.java | 2 +- .../src/main/java/org/dynmap/forge_1_16_5/ForgeWorld.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/FabricWorld.java b/fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/FabricWorld.java index 415673eb..fe611570 100644 --- a/fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/FabricWorld.java +++ b/fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/FabricWorld.java @@ -100,7 +100,7 @@ public class FabricWorld extends DynmapWorld { @Override public long getTime() { if (world != null) - return world.getWorld().getTime(); + return world.getWorld().getTimeOfDay(); else return -1; } diff --git a/fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/FabricWorld.java b/fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/FabricWorld.java index 34fb1cf4..0ee9c574 100644 --- a/fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/FabricWorld.java +++ b/fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/FabricWorld.java @@ -100,7 +100,7 @@ public class FabricWorld extends DynmapWorld { @Override public long getTime() { if (world != null) - return world.getWorld().getTime(); + return world.getWorld().getTimeOfDay(); else return -1; } diff --git a/fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/FabricWorld.java b/fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/FabricWorld.java index 296f32d4..5bf3f871 100644 --- a/fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/FabricWorld.java +++ b/fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/FabricWorld.java @@ -102,7 +102,7 @@ public class FabricWorld extends DynmapWorld { @Override public long getTime() { if (world != null) - return world.getTime(); + return world.getTimeOfDay(); else return -1; } diff --git a/fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/FabricWorld.java b/fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/FabricWorld.java index 79ec123b..74b728b0 100644 --- a/fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/FabricWorld.java +++ b/fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/FabricWorld.java @@ -107,7 +107,7 @@ public class FabricWorld extends DynmapWorld { @Override public long getTime() { if (world != null) - return world.getTime(); + return world.getTimeOfDay(); else return -1; } diff --git a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricWorld.java b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricWorld.java index c8b61edb..a2111558 100644 --- a/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricWorld.java +++ b/fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricWorld.java @@ -107,7 +107,7 @@ public class FabricWorld extends DynmapWorld { @Override public long getTime() { if (world != null) - return world.getTime(); + return world.getTimeOfDay(); else return -1; } diff --git a/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/ForgeWorld.java b/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/ForgeWorld.java index 7effec45..36b6d603 100644 --- a/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/ForgeWorld.java +++ b/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/ForgeWorld.java @@ -137,7 +137,7 @@ public class ForgeWorld extends DynmapWorld public long getTime() { if(world != null) - return world.getWorld().getGameTime(); + return world.getWorld().getDayTime(); else return -1; } diff --git a/forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/ForgeWorld.java b/forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/ForgeWorld.java index f3341a5a..42dc6cbd 100644 --- a/forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/ForgeWorld.java +++ b/forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/ForgeWorld.java @@ -129,7 +129,7 @@ public class ForgeWorld extends DynmapWorld public long getTime() { if(world != null) - return world.getWorld().getGameTime(); + return world.getWorld().getDayTime(); else return -1; } diff --git a/forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/ForgeWorld.java b/forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/ForgeWorld.java index e9d43aa3..c9bc00e4 100644 --- a/forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/ForgeWorld.java +++ b/forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/ForgeWorld.java @@ -129,7 +129,7 @@ public class ForgeWorld extends DynmapWorld public long getTime() { if(world != null) - return world.getWorld().getGameTime(); + return world.getWorld().getDayTime(); else return -1; } diff --git a/forge-1.16.5/src/main/java/org/dynmap/forge_1_16_5/ForgeWorld.java b/forge-1.16.5/src/main/java/org/dynmap/forge_1_16_5/ForgeWorld.java index e3487118..7645e2d9 100644 --- a/forge-1.16.5/src/main/java/org/dynmap/forge_1_16_5/ForgeWorld.java +++ b/forge-1.16.5/src/main/java/org/dynmap/forge_1_16_5/ForgeWorld.java @@ -111,7 +111,7 @@ public class ForgeWorld extends DynmapWorld public long getTime() { if(world != null) - return world.getWorld().getGameTime(); + return world.getWorld().getDayTime(); else return -1; }