summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2014-09-22 21:45:22 +0200
committerAlexander Harkness <me@bearbin.net>2014-09-22 21:45:22 +0200
commit5f823fd18dbfc097b45957d05aeb4d04bf5099fd (patch)
tree8fa683aca43dfabd59c7c90e06c2d1f1a4549bed /src/Entities
parentMerge pull request #1446 from cedeel/patch-1 (diff)
parentChanged metadata reading again. (diff)
downloadcuberite-5f823fd18dbfc097b45957d05aeb4d04bf5099fd.tar
cuberite-5f823fd18dbfc097b45957d05aeb4d04bf5099fd.tar.gz
cuberite-5f823fd18dbfc097b45957d05aeb4d04bf5099fd.tar.bz2
cuberite-5f823fd18dbfc097b45957d05aeb4d04bf5099fd.tar.lz
cuberite-5f823fd18dbfc097b45957d05aeb4d04bf5099fd.tar.xz
cuberite-5f823fd18dbfc097b45957d05aeb4d04bf5099fd.tar.zst
cuberite-5f823fd18dbfc097b45957d05aeb4d04bf5099fd.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Entity.cpp2
-rw-r--r--src/Entities/ItemFrame.cpp2
-rw-r--r--src/Entities/Player.cpp4
3 files changed, 5 insertions, 3 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 996f2fff3..c8ebc4314 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/ItemFrame.cpp b/src/Entities/ItemFrame.cpp
index 0bc10ec60..7f923ef61 100644
--- a/src/Entities/ItemFrame.cpp
+++ b/src/Entities/ItemFrame.cpp
@@ -26,7 +26,7 @@ void cItemFrame::OnRightClicked(cPlayer & a_Player)
{
// Item not empty, rotate, clipping values to zero to three inclusive
m_Rotation++;
- if (m_Rotation >= 4)
+ if (m_Rotation >= 8)
{
m_Rotation = 0;
}
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 38d42be14..871311e86 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->BroadcastPlayerListUpdatePing(*this);
m_LastPlayerListTime = t1.GetNowTime();
}
@@ -1176,6 +1176,8 @@ void cPlayer::SetGameMode(eGameMode a_GameMode)
SetFlying(false);
SetCanFly(false);
}
+
+ m_World->BroadcastPlayerListUpdateGameMode(*this);
}