diff options
| author | tycho <work.tycho@gmail.com> | 2015-09-15 18:12:03 +0200 |
|---|---|---|
| committer | tycho <work.tycho@gmail.com> | 2015-11-11 13:28:12 +0100 |
| commit | 6c4740c79889531ca1109d0f2d81eef6f8326e31 (patch) | |
| tree | 8e35d0d269f70c0e04791f2708f9e551d74e3363 /src/ClientHandle.h | |
| parent | Merge pull request #2632 from Gargaj/patch-1 (diff) | |
| download | cuberite-6c4740c79889531ca1109d0f2d81eef6f8326e31.tar cuberite-6c4740c79889531ca1109d0f2d81eef6f8326e31.tar.gz cuberite-6c4740c79889531ca1109d0f2d81eef6f8326e31.tar.bz2 cuberite-6c4740c79889531ca1109d0f2d81eef6f8326e31.tar.lz cuberite-6c4740c79889531ca1109d0f2d81eef6f8326e31.tar.xz cuberite-6c4740c79889531ca1109d0f2d81eef6f8326e31.tar.zst cuberite-6c4740c79889531ca1109d0f2d81eef6f8326e31.zip | |
Diffstat (limited to 'src/ClientHandle.h')
| -rw-r--r-- | src/ClientHandle.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ClientHandle.h b/src/ClientHandle.h index 32e894d41..60a09f30b 100644 --- a/src/ClientHandle.h +++ b/src/ClientHandle.h @@ -131,14 +131,15 @@ public: // tolua_export /** Called while the client is being ticked from the world via its cPlayer object */ void Tick(float a_Dt); - - /** Called while the client is being ticked from the cServer object */ - void ServerTick(float a_Dt); void Destroy(void); bool IsPlaying (void) const { return (m_State == csPlaying); } - bool IsDestroyed (void) const { return (m_State == csDestroyed); } + bool IsDestroyed (void) const + { + ASSERT((m_State != csDestroyed) || (m_Player == nullptr)); + return (m_State == csDestroyed); + } bool IsDestroying(void) const { return (m_State == csDestroying); } // The following functions send the various packets: |