Skip to content

Commit 966231a

Browse files
authored
Null check storages in global tasks (#690)
Fixes #564 Fixes #680
1 parent d73c219 commit 966231a

3 files changed

Lines changed: 11 additions & 1 deletion

File tree

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/task/WorldBorderUpdateTask.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ public class WorldBorderUpdateTask implements Runnable {
3535
public void run() {
3636
for (UserConnection connection : Via.getManager().getConnectionManager().getConnections()) {
3737
final WorldBorderEmulator worldBorderEmulatorTracker = connection.get(WorldBorderEmulator.class);
38+
if (worldBorderEmulatorTracker == null) {
39+
continue;
40+
}
3841
if (!worldBorderEmulatorTracker.isInit()) continue;
3942

4043
final PlayerSessionStorage playerSession = connection.get(PlayerSessionStorage.class);

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/task/CooldownIndicatorTask.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ public class CooldownIndicatorTask implements Runnable {
2626
@Override
2727
public void run() {
2828
for (UserConnection connection : Via.getManager().getConnectionManager().getConnections()) {
29-
connection.get(CooldownStorage.class).tick(connection);
29+
final CooldownStorage cooldown = connection.get(CooldownStorage.class);
30+
if (cooldown == null) {
31+
continue;
32+
}
33+
cooldown.tick(connection);
3034
}
3135
}
3236
}

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/task/LevitationUpdateTask.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ public void run() {
3636
}
3737
for (UserConnection connection : Via.getManager().getConnectionManager().getConnections()) {
3838
final LevitationStorage levitation = connection.get(LevitationStorage.class);
39+
if (levitation == null) {
40+
continue;
41+
}
3942
if (!levitation.isActive()) {
4043
continue;
4144
}

0 commit comments

Comments
 (0)