summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2021-06-22 20:31:29 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2021-06-28 22:54:21 +0200
commit3252b3d4dc495d70eea7af422f6fe8c252656a36 (patch)
tree4726529ba1948eb1c821db12ebbf6a482913e8ad
parentDon't flush ClientHandle data multiple times (diff)
downloadcuberite-3252b3d4dc495d70eea7af422f6fe8c252656a36.tar
cuberite-3252b3d4dc495d70eea7af422f6fe8c252656a36.tar.gz
cuberite-3252b3d4dc495d70eea7af422f6fe8c252656a36.tar.bz2
cuberite-3252b3d4dc495d70eea7af422f6fe8c252656a36.tar.lz
cuberite-3252b3d4dc495d70eea7af422f6fe8c252656a36.tar.xz
cuberite-3252b3d4dc495d70eea7af422f6fe8c252656a36.tar.zst
cuberite-3252b3d4dc495d70eea7af422f6fe8c252656a36.zip
-rw-r--r--src/Entities/Entity.cpp4
-rw-r--r--src/Entities/Player.cpp2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index a3388a18f..aada520f7 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1687,9 +1687,11 @@ void cEntity::SetSwimState(cChunk & a_Chunk)
BLOCKTYPE Block;
if (!a_Chunk.UnboundedRelGetBlockType(x, y, z, Block))
{
+ /*
LOGD("SetSwimState failure: RelX = %d, RelY = %d, RelZ = %d, Pos = %.02f, %.02f}",
x, y, z, GetPosX(), GetPosZ()
);
+ */
continue;
}
@@ -1716,9 +1718,11 @@ void cEntity::SetSwimState(cChunk & a_Chunk)
BLOCKTYPE BlockIn;
if (!a_Chunk.UnboundedRelGetBlockType(RelX, HeadHeight, RelZ, BlockIn))
{
+ /*
LOGD("SetSwimState failure: RelX = %d, RelY = %d, RelZ = %d, Pos = %.02f, %.02f}",
RelX, HeadHeight, RelZ, GetPosX(), GetPosZ()
);
+ */
return;
}
m_IsHeadInWater = IsBlockWater(BlockIn);
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 12d937baf..cb548daba 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -3136,8 +3136,6 @@ void cPlayer::SpawnOn(cClientHandle & a_Client)
return;
}
- LOGD("Spawing %s on %s", GetName().c_str(), a_Client.GetUsername().c_str());
-
a_Client.SendPlayerSpawn(*this);
a_Client.SendEntityHeadLook(*this);
a_Client.SendEntityEquipment(*this, 0, m_Inventory.GetEquippedItem());