Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 1 insertions, 1 deletions

diff --git a/Minecraft.World/DirectoryLevelStorage.h b/Minecraft.World/DirectoryLevelStorage.h
index 820ef31f..3c811ef3 100644
--- a/Minecraft.World/DirectoryLevelStorage.h
+++ b/Minecraft.World/DirectoryLevelStorage.h
@@ -122,7 +122,7 @@ public:
     virtual void saveLevelData(LevelData *levelData, vector<shared_ptr<Player> > *players);
     virtual void saveLevelData(LevelData *levelData);
     virtual void save(shared_ptr<Player> player);
-    virtual bool load(shared_ptr<Player> player);  // 4J Changed return val to bool to check if new player or loaded player
+    virtual CompoundTag *load(shared_ptr<Player> player);  // 4J Changed return val to bool to check if new player or loaded player
     virtual CompoundTag *loadPlayerDataTag(PlayerUID xuid);
 	virtual void clearOldPlayerFiles(); // 4J Added
     PlayerIO *getPlayerIO();