summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-06-17 13:33:41 +0200
committerHowaner <franzi.moos@googlemail.com>2014-06-17 13:33:41 +0200
commitce06ec1632ffb15243e2270ed31632e8d3566f39 (patch)
tree04500a1a907c75675b5203b83cc6c8de3b67cd07
parentThe same: Float, not Double (diff)
downloadcuberite-ce06ec1632ffb15243e2270ed31632e8d3566f39.tar
cuberite-ce06ec1632ffb15243e2270ed31632e8d3566f39.tar.gz
cuberite-ce06ec1632ffb15243e2270ed31632e8d3566f39.tar.bz2
cuberite-ce06ec1632ffb15243e2270ed31632e8d3566f39.tar.lz
cuberite-ce06ec1632ffb15243e2270ed31632e8d3566f39.tar.xz
cuberite-ce06ec1632ffb15243e2270ed31632e8d3566f39.tar.zst
cuberite-ce06ec1632ffb15243e2270ed31632e8d3566f39.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/ArrowEntity.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Entities/ArrowEntity.cpp b/src/Entities/ArrowEntity.cpp
index 9a8571a31..e46d21515 100644
--- a/src/Entities/ArrowEntity.cpp
+++ b/src/Entities/ArrowEntity.cpp
@@ -119,8 +119,8 @@ void cArrowEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos)
(int)std::floor(GetPosX() * 8.0),
(int)std::floor(GetPosY() * 8.0),
(int)std::floor(GetPosZ() * 8.0),
- 0.5F,
- 0.75F + ((float)((GetUniqueID() * 23) % 32)) / 64F
+ 0.5f,
+ 0.75f + ((float)((GetUniqueID() * 23) % 32)) / 64.0f
);
Destroy();
@@ -134,7 +134,7 @@ void cArrowEntity::CollectedBy(cPlayer * a_Dest)
{
if (m_IsInGround && !m_bIsCollected && CanPickup(*a_Dest))
{
- if (m_PickupState == 1)
+ if (m_PickupState == psInSurvivalOrCreative)
{
int NumAdded = a_Dest->GetInventory().AddItem(E_ITEM_ARROW);
if (NumAdded == 0)