Fix issues found with saveData being in world/player nbt instead.