summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-05-09 13:22:59 +0200
committerMattes D <github@xoft.cz>2015-05-09 13:22:59 +0200
commitca949447eefe74804e677fff5a46a1f18a826901 (patch)
tree911736baccf3617a13f6b7e04ebbfe3fe035fb50 /src/Entities/Entity.cpp
parentRabbit and cooked rabbit now stackable (diff)
parentAdded check against "Type const &" and "Type const *". (diff)
downloadcuberite-ca949447eefe74804e677fff5a46a1f18a826901.tar
cuberite-ca949447eefe74804e677fff5a46a1f18a826901.tar.gz
cuberite-ca949447eefe74804e677fff5a46a1f18a826901.tar.bz2
cuberite-ca949447eefe74804e677fff5a46a1f18a826901.tar.lz
cuberite-ca949447eefe74804e677fff5a46a1f18a826901.tar.xz
cuberite-ca949447eefe74804e677fff5a46a1f18a826901.tar.zst
cuberite-ca949447eefe74804e677fff5a46a1f18a826901.zip
Diffstat (limited to 'src/Entities/Entity.cpp')
-rw-r--r--src/Entities/Entity.cpp7
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