diff options
| author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-21 14:32:40 +0100 |
|---|---|---|
| committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-21 14:32:40 +0100 |
| commit | 779aca60511055832e776ab4a6299a2b7e049a16 (patch) | |
| tree | dfb031e9bd01b25ab0199286cf6e660f26489817 /src/Entities/Player.h | |
| parent | Merge branch 'master' into cmake (diff) | |
| parent | Merge branch 'master', remote-tracking branch 'upstream/master' (diff) | |
| download | cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.gz cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.bz2 cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.lz cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.xz cuberite-779aca60511055832e776ab4a6299a2b7e049a16.tar.zst cuberite-779aca60511055832e776ab4a6299a2b7e049a16.zip | |
Diffstat (limited to 'src/Entities/Player.h')
| -rw-r--r-- | src/Entities/Player.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Entities/Player.h b/src/Entities/Player.h index 74da857e8..c0ad9eeac 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -407,9 +407,6 @@ protected: float m_TimeLastPickupCheck; - void ResolvePermissions(); - - void ResolveGroups(); char m_Color; float m_LastBlockActionTime; @@ -417,6 +414,7 @@ protected: eGameMode m_GameMode; std::string m_IP; + /// The item being dragged by the cursor while in a UI window cItem m_DraggingItem; long long m_LastPlayerListTime; @@ -456,6 +454,11 @@ protected: int m_FloaterID; + + + void ResolvePermissions(void); + void ResolveGroups(void); + virtual void Destroyed(void); /// Filters out damage for creative mode |