From 0f39b1671b17218c76361172c74da4c46db2144e Mon Sep 17 00:00:00 2001 From: Beanes Date: Fri, 19 Jun 2026 20:52:33 +0200 Subject: [PATCH] Fix global tasks erroring --- .../protocol/v1_8to1_7_6_10/task/WorldBorderUpdateTask.java | 3 +++ .../protocol/v1_9to1_8/task/CooldownIndicatorTask.java | 6 +++++- .../protocol/v1_9to1_8/task/LevitationUpdateTask.java | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/task/WorldBorderUpdateTask.java b/common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/task/WorldBorderUpdateTask.java index 369b7cf63..aa892687d 100644 --- a/common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/task/WorldBorderUpdateTask.java +++ b/common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/task/WorldBorderUpdateTask.java @@ -35,6 +35,9 @@ public class WorldBorderUpdateTask implements Runnable { public void run() { for (UserConnection connection : Via.getManager().getConnectionManager().getConnections()) { final WorldBorderEmulator worldBorderEmulatorTracker = connection.get(WorldBorderEmulator.class); + if (worldBorderEmulatorTracker == null) { + continue; + } if (!worldBorderEmulatorTracker.isInit()) continue; final PlayerSessionStorage playerSession = connection.get(PlayerSessionStorage.class); diff --git a/common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/task/CooldownIndicatorTask.java b/common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/task/CooldownIndicatorTask.java index c48fc40f5..5c714ec59 100644 --- a/common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/task/CooldownIndicatorTask.java +++ b/common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/task/CooldownIndicatorTask.java @@ -26,7 +26,11 @@ public class CooldownIndicatorTask implements Runnable { @Override public void run() { for (UserConnection connection : Via.getManager().getConnectionManager().getConnections()) { - connection.get(CooldownStorage.class).tick(connection); + final CooldownStorage cooldown = connection.get(CooldownStorage.class); + if (cooldown == null) { + continue; + } + cooldown.tick(connection); } } } diff --git a/common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/task/LevitationUpdateTask.java b/common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/task/LevitationUpdateTask.java index 47bf97e53..cedd69143 100644 --- a/common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/task/LevitationUpdateTask.java +++ b/common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/task/LevitationUpdateTask.java @@ -36,6 +36,9 @@ public void run() { } for (UserConnection connection : Via.getManager().getConnectionManager().getConnections()) { final LevitationStorage levitation = connection.get(LevitationStorage.class); + if (levitation == null) { + continue; + } if (!levitation.isActive()) { continue; }