summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-05-06 00:45:35 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-05-06 00:45:35 +0200
commit1df7dbe7c91953c2413908b846649e884b7ac53c (patch)
treee385aaf8d1a0c3bf7380aaf6847e66ecb1ba4873 /src
parentA bit of reformatting. (diff)
downloadcuberite-1df7dbe7c91953c2413908b846649e884b7ac53c.tar
cuberite-1df7dbe7c91953c2413908b846649e884b7ac53c.tar.gz
cuberite-1df7dbe7c91953c2413908b846649e884b7ac53c.tar.bz2
cuberite-1df7dbe7c91953c2413908b846649e884b7ac53c.tar.lz
cuberite-1df7dbe7c91953c2413908b846649e884b7ac53c.tar.xz
cuberite-1df7dbe7c91953c2413908b846649e884b7ac53c.tar.zst
cuberite-1df7dbe7c91953c2413908b846649e884b7ac53c.zip
Diffstat (limited to 'src')
-rw-r--r--src/Entities/Entity.cpp2
-rw-r--r--src/Entities/Player.cpp2
-rw-r--r--src/Items/ItemThrowable.h14
3 files changed, 11 insertions, 7 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 644afe69e..4cf10a219 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1211,7 +1211,7 @@ void cEntity::BroadcastMovementUpdate(const cClientHandle * a_Exclude)
int DiffY = (int)(floor(GetPosY() * 32.0) - floor(m_LastPos.y * 32.0));
int DiffZ = (int)(floor(GetPosZ() * 32.0) - floor(m_LastPos.z * 32.0));
- if ((abs(DiffX) != 0) || (abs(DiffY) != 0) || (abs(DiffZ) != 0)) // Have we moved?
+ if ((DiffX != 0) || (DiffY != 0) || (DiffZ != 0)) // Have we moved?
{
if ((abs(DiffX) <= 127) && (abs(DiffY) <= 127) && (abs(DiffZ) <= 127)) // Limitations of a Byte
{
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index bcbf58623..d63e5461a 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -212,7 +212,7 @@ void cPlayer::Tick(float a_Dt, cChunk & a_Chunk)
SendExperience();
}
- if ((GetPosition() - m_LastPos).SqrLength() != 0.0) // Change in position from last tick?
+ if (!(GetPosition() - m_LastPos).Equals(Vector3d(0, 0, 0))) // Change in position from last tick?
{
// Apply food exhaustion from movement:
ApplyFoodExhaustionFromMovement();
diff --git a/src/Items/ItemThrowable.h b/src/Items/ItemThrowable.h
index f90caf037..35c2b8731 100644
--- a/src/Items/ItemThrowable.h
+++ b/src/Items/ItemThrowable.h
@@ -28,15 +28,19 @@ public:
virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override
{
+ Vector3d Pos = a_Player->GetThrowStartPos();
+ Vector3d Speed = a_Player->GetLookVector() * m_SpeedCoeff;
+
+ if (a_World->CreateProjectile(Pos.x, Pos.y, Pos.z, m_ProjectileKind, a_Player, a_Player->GetEquippedItem(), &Speed) < 0)
+ {
+ return false;
+ }
+
if (!a_Player->IsGameModeCreative())
{
a_Player->GetInventory().RemoveOneEquippedItem();
}
- Vector3d Pos = a_Player->GetThrowStartPos();
- Vector3d Speed = a_Player->GetLookVector() * m_SpeedCoeff;
- a_World->CreateProjectile(Pos.x, Pos.y, Pos.z, m_ProjectileKind, a_Player, a_Player->GetEquippedItem(), &Speed);
-
return true;
}
@@ -127,7 +131,7 @@ public:
return false;
}
- if (a_World->CreateProjectile(a_BlockX + 0.5, a_BlockY + 1, a_BlockZ + 0.5, m_ProjectileKind, a_Player, a_Player->GetEquippedItem()) == -1)
+ if (a_World->CreateProjectile(a_BlockX + 0.5, a_BlockY + 1, a_BlockZ + 0.5, m_ProjectileKind, a_Player, a_Player->GetEquippedItem()) < 0)
{
return false;
}