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

Update m_LastSentPosition in TeleportToCoords and DoMoveToWorld. (#4211)

Browse Source
This commit is contained in:
peterbell10
2018-04-11 08:39:24 +01:00
committed by Alexander Harkness
parent a0896c63d7
commit 4bf160d596
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Entities/Entity.cpp
View File

@@ -1541,7 +1541,7 @@ bool cEntity::DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn, Vector3d
auto OldChunkCoords = cChunkDef::BlockToChunk(GetPosition());
// Set position to the new position
SetPosition(a_NewPosition);
ResetPosition(a_NewPosition);
// Stop all mobs from targeting this entity
// Stop this entity from targeting other mobs
@@ -1759,6 +1759,16 @@ void cEntity::HandleAir(void)
void cEntity::ResetPosition(Vector3d a_NewPos)
{
SetPosition(a_NewPos);
m_LastSentPosition = GetPosition();
}
void cEntity::OnStartedBurning(void)
{
// Broadcast the change:
@@ -1850,7 +1860,7 @@ void cEntity::TeleportToCoords(double a_PosX, double a_PosY, double a_PosZ)
// ask the plugins to allow teleport to the new position.
if (!cRoot::Get()->GetPluginManager()->CallHookEntityTeleport(*this, m_LastPosition, Vector3d(a_PosX, a_PosY, a_PosZ)))
{
SetPosition(a_PosX, a_PosY, a_PosZ);
ResetPosition({a_PosX, a_PosY, a_PosZ});
m_World->BroadcastTeleportEntity(*this);
}
}