diff options
author | Mat <mail@mathias.is> | 2020-03-05 11:52:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-05 11:52:34 +0100 |
commit | 7d4934534e9c58a111215859ba83c32a9bc0fa8a (patch) | |
tree | cb9af9fea3de762410cb49c62a030b96e01eec6c /src/Entities/Player.h | |
parent | Update LastSentPosition when entity has no speed (#4487) (diff) | |
download | cuberite-7d4934534e9c58a111215859ba83c32a9bc0fa8a.tar cuberite-7d4934534e9c58a111215859ba83c32a9bc0fa8a.tar.gz cuberite-7d4934534e9c58a111215859ba83c32a9bc0fa8a.tar.bz2 cuberite-7d4934534e9c58a111215859ba83c32a9bc0fa8a.tar.lz cuberite-7d4934534e9c58a111215859ba83c32a9bc0fa8a.tar.xz cuberite-7d4934534e9c58a111215859ba83c32a9bc0fa8a.tar.zst cuberite-7d4934534e9c58a111215859ba83c32a9bc0fa8a.zip |
Diffstat (limited to 'src/Entities/Player.h')
-rw-r--r-- | src/Entities/Player.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Entities/Player.h b/src/Entities/Player.h index c9249b2f1..1ce2c5d9d 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -387,10 +387,6 @@ public: void SetVisible( bool a_bVisible); // tolua_export bool IsVisible(void) const { return m_bVisible; } // tolua_export - /** Moves the player to the specified world. - Returns true if successful, false on failure (world not found). */ - virtual bool DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn, Vector3d a_NewPosition) override; - /** Saves all player data, such as inventory, to JSON */ bool SaveToDisk(void); @@ -735,6 +731,8 @@ protected: /** The main hand of the player */ eMainHand m_MainHand; + virtual void DoMoveToWorld(const cEntity::sWorldChangeInfo & a_WorldChangeInfo) override; + /** Sets the speed and sends it to the client, so that they are forced to move so. */ virtual void DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ) override; |