diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/redstone/NeighborUpdaterMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/redstone/NeighborUpdaterMixin.java
index d4a1ea88..71d264f2 100644
--- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/redstone/NeighborUpdaterMixin.java
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/level/redstone/NeighborUpdaterMixin.java
@@ -35,7 +35,7 @@ public interface NeighborUpdaterMixin {
     }
 
     @Decorate(method = "executeUpdate", inject = true, at = @At(value = "INVOKE", target = "Lnet/minecraft/CrashReport;forThrowable(Ljava/lang/Throwable;Ljava/lang/String;)Lnet/minecraft/CrashReport;"))
-    private static void arclight$setLastPhysicsProblem(BlockState instance, Level level, BlockPos pos, @Local(ordinal = -1) Throwable t) {
+    private static void arclight$setLastPhysicsProblem(Level level, BlockState instance, BlockPos pos, @Local(ordinal = -1) Throwable t) {
         if (t instanceof StackOverflowError) {
             ((WorldBridge) level).bridge$setLastPhysicsProblem(pos.immutable());
         }
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/PlayerDataMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/PlayerDataMixin.java
index a7ca731f..eec4570c 100644
--- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/PlayerDataMixin.java
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/storage/PlayerDataMixin.java
@@ -1,11 +1,14 @@
 package io.izzel.arclight.common.mixin.core.world.storage;
 
+import com.mojang.datafixers.DataFixer;
 import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge;
 import io.izzel.arclight.common.bridge.core.world.storage.PlayerDataBridge;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtAccounter;
 import net.minecraft.nbt.NbtIo;
+import net.minecraft.nbt.NbtUtils;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.util.datafix.DataFixTypes;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.storage.PlayerDataStorage;
 import org.slf4j.Logger;
@@ -19,6 +22,12 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Optional;
 
 @Mixin(PlayerDataStorage.class)
@@ -27,6 +36,8 @@ public class PlayerDataMixin implements PlayerDataBridge {
     // @formatter:off
     @Shadow @Final private File playerDir;
     @Shadow @Final private static Logger LOGGER;
+    @Shadow @Final private static DateTimeFormatter FORMATTER;
+    @Shadow @Final protected DataFixer fixerUpper;
     // @formatter:on
 
     @Inject(method = "load(Lnet/minecraft/world/entity/player/Player;Ljava/lang/String;)Ljava/util/Optional;", at = @At("RETURN"))
@@ -59,6 +70,95 @@ public CompoundTag getPlayerData(String uuid) {
         return null;
     }
 
+    private void backup(String name, String s1, String s) { // name, uuid, extension
+        Path path = this.playerDir.toPath();
+        // String s1 = entityhuman.getStringUUID(); // CraftBukkit - used above
+        Path path1 = path.resolve(s1 + s);
+
+        // s1 = entityhuman.getStringUUID(); // CraftBukkit - used above
+        Path path2 = path.resolve(s1 + "_corrupted_" + LocalDateTime.now().format(FORMATTER) + s);
+
+        if (Files.isRegularFile(path1, new LinkOption[0])) {
+            try {
+                Files.copy(path1, path2, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
+            } catch (Exception exception) {
+                LOGGER.warn("Failed to copy the player.dat file for {}", name, exception); // CraftBukkit
+            }
+
+        }
+    }
+
+    // CraftBukkit start
+    private Optional<CompoundTag> load(String name, String s1, String s) { // name, uuid, extension
+        // CraftBukkit end
+        File file = this.playerDir;
+        // String s1 = entityhuman.getStringUUID(); // CraftBukkit - used above
+        File file1 = new File(file, s1 + s);
+        // Spigot Start
+        boolean usingWrongFile = false;
+        if (!file1.exists()) {
+            file1 = new File(file, java.util.UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(java.nio.charset.StandardCharsets.UTF_8)).toString() + s);
+            if (file1.exists()) {
+                usingWrongFile = true;
+                org.bukkit.Bukkit.getServer().getLogger().warning("Using offline mode UUID file for player " + name + " as it is the only copy we can find.");
+            }
+        }
+        // Spigot End
+
+        if (file1.exists() && file1.isFile()) {
+            try {
+                // Spigot Start
+                Optional<CompoundTag> optional = Optional.of(NbtIo.readCompressed(file1.toPath(), NbtAccounter.unlimitedHeap()));
+                if (usingWrongFile) {
+                    file1.renameTo(new File(file1.getPath() + ".offline-read"));
+                }
+                return optional;
+                // Spigot End
+            } catch (Exception exception) {
+                LOGGER.warn("Failed to load player data for {}", name); // CraftBukkit
+            }
+        }
+
+        return Optional.empty();
+    }
+
+    public Optional<CompoundTag> load(Player entityhuman) {
+        // CraftBukkit start
+        return load(entityhuman.getName().getString(), entityhuman.getStringUUID()).map((nbttagcompound) -> {
+            if (entityhuman instanceof ServerPlayer) {
+                CraftPlayer player = (CraftPlayer) entityhuman.bridge$getBukkitEntity();
+                // Only update first played if it is older than the one we have
+                long modified = new File(this.playerDir, entityhuman.getStringUUID() + ".dat").lastModified();
+                if (modified < player.getFirstPlayed()) {
+                    player.setFirstPlayed(modified);
+                }
+            }
+
+            entityhuman.load(nbttagcompound); // From below
+            return nbttagcompound;
+        });
+    }
+
+
+    public Optional<CompoundTag> load(String name, String uuid) {
+        // CraftBukkit end
+        Optional<CompoundTag> optional = this.load(name, uuid, ".dat"); // CraftBukkit
+
+        if (optional.isEmpty()) {
+            this.backup(name, uuid, ".dat"); // CraftBukkit
+        }
+
+        return optional.or(() -> {
+            return this.load(name, uuid, ".dat_old"); // CraftBukkit
+        }).map((nbttagcompound) -> {
+            int i = NbtUtils.getDataVersion(nbttagcompound, -1);
+
+            nbttagcompound = DataFixTypes.PLAYER.updateToCurrentVersion(this.fixerUpper, nbttagcompound, i);
+            // entityhuman.load(nbttagcompound); // CraftBukkit - handled above
+            return nbttagcompound;
+        });
+    }
+
     @Override
     public File bridge$getPlayerDir() {
         return getPlayerDir();