summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authortycho <work.tycho@gmail.com>2015-09-15 18:12:03 +0200
committertycho <work.tycho@gmail.com>2015-11-11 13:28:12 +0100
commit6c4740c79889531ca1109d0f2d81eef6f8326e31 (patch)
tree8e35d0d269f70c0e04791f2708f9e551d74e3363 /src/Entities
parentMerge pull request #2632 from Gargaj/patch-1 (diff)
downloadcuberite-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/Entities')
-rw-r--r--src/Entities/Player.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 3bea60af7..5c38f19bd 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -144,6 +144,7 @@ cPlayer::cPlayer(cClientHandlePtr a_Client, const AString & a_PlayerName) :
cPlayer::~cPlayer(void)
{
+ ASSERT((m_World == nullptr) || m_World->HasEntity(m_UniqueID));
if (!cRoot::Get()->GetPluginManager()->CallHookPlayerDestroyed(*this))
{
cRoot::Get()->BroadcastChatLeave(Printf("%s has left the game", GetName().c_str()));
@@ -163,6 +164,8 @@ cPlayer::~cPlayer(void)
m_InventoryWindow = nullptr;
LOGD("Player %p deleted", static_cast<void *>(this));
+
+ ASSERT((m_World == nullptr) || m_World->HasEntity(m_UniqueID));
}
@@ -1278,7 +1281,6 @@ void cPlayer::SetCapabilities()
if (IsGameModeSpectator())
{
SetVisible(false);
- SetCanFly(true);
}
else
{