From d49ce751ba6f8f2eb171633cea30a1119935f8c7 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Thu, 11 Nov 2021 21:02:29 +0000 Subject: Miscellaneous fixes (#5320) * Protocol: update Abilities flags + Add Spectator handling * BioGen: move include * ClientHandle: rename Respawn packet dimension check flag * Make it clearer what it's doing. * ClientHandle: move ProcessProtocolIn calls to World * Player: remove some redundant initialisation * Player: UpdateCapabilities enables flight for spectators * Produce growth: improve comments * ClientHandle: run unload checks using delta time * Fix forgotten initialisation of time member --- src/Entities/Player.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/Entities/Player.h') diff --git a/src/Entities/Player.h b/src/Entities/Player.h index d1dfffa0b..87eaad2fe 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -419,15 +419,10 @@ public: /** Saves all player data, such as inventory, to JSON. */ void SaveToDisk(void); - /** Loads the player data from the disk file. + /** Loads the player data from the save file. Sets m_World to the world where the player will spawn, based on the stored world name or the default world by calling LoadFromFile(). */ void LoadFromDisk(); - /** Loads the player data from the specified file. - Sets m_World to the world where the player will spawn, based on the stored world name or the default world. - Returns true on success, false if the player wasn't found, and excepts with base std::runtime_error if the data couldn't be read or parsed. */ - bool LoadFromFile(const AString & a_FileName); - const AString & GetLoadedWorldName() const { return m_CurrentWorldName; } /** Opens the inventory of any tame horse the player is riding. -- cgit v1.2.3