diff options
author | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-04-05 13:47:16 +0200 |
---|---|---|
committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-04-05 13:47:16 +0200 |
commit | a6b0c74f79dc6654b67b20c5c77965dccc044412 (patch) | |
tree | 555e9d4c2a7c337df931bea567f47d0aef0c6fd8 /src/Entities/Player.h | |
parent | Merge pull request #3121 from LogicParrot/loops (diff) | |
parent | Improved player freeze code (diff) | |
download | cuberite-a6b0c74f79dc6654b67b20c5c77965dccc044412.tar cuberite-a6b0c74f79dc6654b67b20c5c77965dccc044412.tar.gz cuberite-a6b0c74f79dc6654b67b20c5c77965dccc044412.tar.bz2 cuberite-a6b0c74f79dc6654b67b20c5c77965dccc044412.tar.lz cuberite-a6b0c74f79dc6654b67b20c5c77965dccc044412.tar.xz cuberite-a6b0c74f79dc6654b67b20c5c77965dccc044412.tar.zst cuberite-a6b0c74f79dc6654b67b20c5c77965dccc044412.zip |
Diffstat (limited to 'src/Entities/Player.h')
-rw-r--r-- | src/Entities/Player.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/Entities/Player.h b/src/Entities/Player.h index 777a533c9..f04bcdd39 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -50,7 +50,7 @@ public: virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override; - void TickFreezeCode(bool a_MyChunkIsSent); + void TickFreezeCode(); virtual void HandlePhysics(std::chrono::milliseconds a_Dt, cChunk &) override { UNUSED(a_Dt); } @@ -148,9 +148,6 @@ public: /** Is the player frozen? */ bool IsFrozen(); - /** How long has the player been frozen? */ - int GetFrozenDuration(); - /** Cancels Freeze(...) and allows the player to move naturally. */ void Unfreeze(); @@ -605,15 +602,9 @@ protected: cSlotNums m_InventoryPaintSlots; - /** if m_IsFrozen is true, we lock m_Location to this position. */ - Vector3d m_FrozenPosition; - /** If true, we are locking m_Position to m_FrozenPosition. */ bool m_IsFrozen; - /** */ - int m_FreezeCounter; - /** Was the player frozen manually by a plugin or automatically by the server? */ bool m_IsManuallyFrozen; |