flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Initial work on 1.13 entity metadata (#4539)

Browse Source 
* Initial work on 1.13 entity metadata

* Largely complete metadata

Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
This commit is contained in:
Mat
2020-07-17 21:33:02 +03:00
committed by GitHub
parent ff2c246de2
commit eb0f640fa0
4 changed files with 1087 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Entities/Boat.cpp
View File

@@ -34,6 +34,7 @@ cBoat::cBoat(Vector3d a_Pos, eMaterial a_Material) :
void cBoat::SpawnOn(cClientHandle & a_ClientHandle)
{
a_ClientHandle.SendSpawnEntity(*this);
a_ClientHandle.SendEntityMetadata(*this); // Boat colour
}
@@ -154,9 +155,6 @@ void cBoat::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
{
SetLastDamage(GetLastDamage() - 1);
}
// Broadcast any changes in position
m_World->BroadcastEntityMetadata(*this);
}
@@ -183,6 +181,9 @@ void cBoat::HandleSpeedFromAttachee(float a_Forward, float a_Sideways)
void cBoat::SetLastDamage(int TimeSinceLastHit)
{
m_LastDamage = TimeSinceLastHit;
// Tell the client to play the shaking animation
m_World->BroadcastEntityMetadata(*this);
}
@@ -191,10 +192,16 @@ void cBoat::SetLastDamage(int TimeSinceLastHit)
void cBoat::UpdatePaddles(bool a_RightPaddleUsed, bool a_LeftPaddleUsed)
{
// Avoid telling client what it already knows since it may reset animation 1.13+
const bool Changed = (m_RightPaddleUsed != a_RightPaddleUsed) || (m_LeftPaddleUsed != a_LeftPaddleUsed);
m_RightPaddleUsed = a_RightPaddleUsed;
m_LeftPaddleUsed = a_LeftPaddleUsed;
m_World->BroadcastEntityMetadata(*this);
if (Changed)
{
m_World->BroadcastEntityMetadata(*this);
}
}