diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/data/PlayerData.java b/src/main/java/de/ellpeck/actuallyadditions/mod/data/PlayerData.java index c52d434c2..7e29460d8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/data/PlayerData.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/data/PlayerData.java @@ -23,9 +23,15 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; public final class PlayerData { - + private static PlayerSave clientData = null; public static PlayerSave getDataFromPlayer(Player player) { - WorldData worldData = WorldData.get((ServerLevel) player.getCommandSenderWorld()); + if (!(player.getCommandSenderWorld() instanceof ServerLevel)) { + if (clientData == null) { + clientData = new PlayerSave(player.getUUID()); + } + return clientData; + } + WorldData worldData = WorldData.get(player.getCommandSenderWorld()); ConcurrentHashMap data = worldData.playerSaveData; UUID id = player.getUUID();