diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-05-10 13:16:20 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-05-10 13:16:20 +0200 |
| commit | 9c490293b88f9828577e5431c5151f7f1bec09f4 (patch) | |
| tree | be616a3c3b2db083b2f3908220818231778609ef /src/Entities/Entity.cpp | |
| parent | Fixed some warnings and logic errors in Monster.cpp (diff) | |
| parent | Merge pull request #1985 from SafwatHalaby/lessPathCalcs (diff) | |
| download | cuberite-9c490293b88f9828577e5431c5151f7f1bec09f4.tar cuberite-9c490293b88f9828577e5431c5151f7f1bec09f4.tar.gz cuberite-9c490293b88f9828577e5431c5151f7f1bec09f4.tar.bz2 cuberite-9c490293b88f9828577e5431c5151f7f1bec09f4.tar.lz cuberite-9c490293b88f9828577e5431c5151f7f1bec09f4.tar.xz cuberite-9c490293b88f9828577e5431c5151f7f1bec09f4.tar.zst cuberite-9c490293b88f9828577e5431c5151f7f1bec09f4.zip | |
Diffstat (limited to 'src/Entities/Entity.cpp')
| -rw-r--r-- | src/Entities/Entity.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index b87cf51a6..4a909a1fd 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -1309,7 +1309,8 @@ bool cEntity::DetectPortal() if (IsPlayer()) { - ((cPlayer *)this)->GetClientHandle()->SendRespawn(dimOverworld); // Send a respawn packet before world is loaded/generated so the client isn't left in limbo + // Send a respawn packet before world is loaded / generated so the client isn't left in limbo + ((cPlayer *)this)->GetClientHandle()->SendRespawn(dimOverworld); } return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetLinkedOverworldName()), false); @@ -1688,8 +1689,8 @@ void cEntity::BroadcastMovementUpdate(const cClientHandle * a_Exclude) { m_World->BroadcastEntityRelMove(*this, (char)DiffX, (char)DiffY, (char)DiffZ, a_Exclude); } - // Clients seem to store two positions, one for the velocity packet and one for the teleport/relmove packet - // The latter is only changed with a relmove/teleport, and m_LastPos stores this position + // Clients seem to store two positions, one for the velocity packet and one for the teleport / relmove packet + // The latter is only changed with a relmove / teleport, and m_LastPos stores this position m_LastPos = GetPosition(); } else |