summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-09-09 03:02:25 +0200
committerHowaner <franzi.moos@googlemail.com>2014-09-09 03:02:25 +0200
commitf94df06b6601f9dcecd383f5d093d225f41d1c65 (patch)
tree891720327a4971886e909e19f04bf1734addee8c /src/Entities
parentMerge branch 'master' into 1.8-Protocol (diff)
downloadcuberite-f94df06b6601f9dcecd383f5d093d225f41d1c65.tar
cuberite-f94df06b6601f9dcecd383f5d093d225f41d1c65.tar.gz
cuberite-f94df06b6601f9dcecd383f5d093d225f41d1c65.tar.bz2
cuberite-f94df06b6601f9dcecd383f5d093d225f41d1c65.tar.lz
cuberite-f94df06b6601f9dcecd383f5d093d225f41d1c65.tar.xz
cuberite-f94df06b6601f9dcecd383f5d093d225f41d1c65.tar.zst
cuberite-f94df06b6601f9dcecd383f5d093d225f41d1c65.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Entity.cpp2
-rw-r--r--src/Entities/Player.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 9bcdcffeb..fba688847 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -135,7 +135,7 @@ const char * cEntity::GetParentClass(void) const
bool cEntity::Initialize(cWorld & a_World)
{
- if (cPluginManager::Get()->CallHookSpawningEntity(a_World, *this))
+ if (cPluginManager::Get()->CallHookSpawningEntity(a_World, *this) && !IsPlayer())
{
return false;
}
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index b0da6965a..a720d8c35 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -266,7 +266,7 @@ void cPlayer::Tick(float a_Dt, cChunk & a_Chunk)
cTimer t1;
if (m_LastPlayerListTime + PLAYER_LIST_TIME_MS <= t1.GetNowTime())
{
- m_World->SendPlayerList(this);
+ m_World->BroadcastPlayerListItem(*this, 2);
m_LastPlayerListTime = t1.GetNowTime();
}
@@ -1172,6 +1172,8 @@ void cPlayer::SetGameMode(eGameMode a_GameMode)
SetFlying(false);
SetCanFly(false);
}
+
+ m_World->BroadcastPlayerListItem(*this, 1);
}