summaryrefslogtreecommitdiffstats
path: root/src/Entities/Player.h
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-06-14 17:10:53 +0200
committermadmaxoft <github@xoft.cz>2014-06-14 17:10:53 +0200
commit3f009a7c9e35a08d5685cd4276e17fc8f3443f9e (patch)
tree2690eca907fe5d28ee3dcbabaedaacc21e23d8a1 /src/Entities/Player.h
parentMerge branch 'master' into cPlayerSetSpeed (diff)
downloadcuberite-3f009a7c9e35a08d5685cd4276e17fc8f3443f9e.tar
cuberite-3f009a7c9e35a08d5685cd4276e17fc8f3443f9e.tar.gz
cuberite-3f009a7c9e35a08d5685cd4276e17fc8f3443f9e.tar.bz2
cuberite-3f009a7c9e35a08d5685cd4276e17fc8f3443f9e.tar.lz
cuberite-3f009a7c9e35a08d5685cd4276e17fc8f3443f9e.tar.xz
cuberite-3f009a7c9e35a08d5685cd4276e17fc8f3443f9e.tar.zst
cuberite-3f009a7c9e35a08d5685cd4276e17fc8f3443f9e.zip
Diffstat (limited to 'src/Entities/Player.h')
-rw-r--r--src/Entities/Player.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 165963e6e..325ff9005 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -195,17 +195,9 @@ public:
void LoginSetGameMode(eGameMode a_GameMode);
/** Forces the player to move in the given direction.
- * @deprecated Use SetSpeed instead.
- */
+ @deprecated Use SetSpeed instead. */
void ForceSetSpeed(const Vector3d & a_Speed); // tolua_export
- /** Sets the speed of the player and moves them in the given speed. */
- void SetSpeed (const Vector3d & a_Speed);
- virtual void SetSpeed (double a_SpeedX, double a_SpeedY, double a_SpeedZ) override;
- virtual void SetSpeedX (double a_SpeedX) override;
- virtual void SetSpeedY (double a_SpeedY) override;
- virtual void SetSpeedZ (double a_SpeedZ) override;
-
/** Tries to move to a new position, with attachment-related checks (y == -999) */
void MoveTo(const Vector3d & a_NewPos); // tolua_export
@@ -521,6 +513,9 @@ protected:
+ /** 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;
+
void ResolvePermissions(void);
void ResolveGroups(void);