summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-09-04 19:13:46 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-09-04 19:13:46 +0200
commitfd35f6d70764626ddc7cfd49b0fb8a7f3e4149ab (patch)
treeecf6ec77a7dd91d90cd96c24056c6596aad22180 /source
parentAdded better push out of entities (diff)
downloadcuberite-fd35f6d70764626ddc7cfd49b0fb8a7f3e4149ab.tar
cuberite-fd35f6d70764626ddc7cfd49b0fb8a7f3e4149ab.tar.gz
cuberite-fd35f6d70764626ddc7cfd49b0fb8a7f3e4149ab.tar.bz2
cuberite-fd35f6d70764626ddc7cfd49b0fb8a7f3e4149ab.tar.lz
cuberite-fd35f6d70764626ddc7cfd49b0fb8a7f3e4149ab.tar.xz
cuberite-fd35f6d70764626ddc7cfd49b0fb8a7f3e4149ab.tar.zst
cuberite-fd35f6d70764626ddc7cfd49b0fb8a7f3e4149ab.zip
Diffstat (limited to 'source')
-rw-r--r--source/Entities/Pickup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/Entities/Pickup.cpp b/source/Entities/Pickup.cpp
index 9b388366a..ef1581c1a 100644
--- a/source/Entities/Pickup.cpp
+++ b/source/Entities/Pickup.cpp
@@ -25,7 +25,7 @@
cPickup::cPickup(int a_MicroPosX, int a_MicroPosY, int a_MicroPosZ, const cItem & a_Item, float a_SpeedX /* = 0.f */, float a_SpeedY /* = 0.f */, float a_SpeedZ /* = 0.f */)
- : cEntity(etPickup, ((double)(a_MicroPosX)) / 32, ((double)(a_MicroPosY)) / 32, ((double)(a_MicroPosZ)) / 32, 0.2, 0.2)
+ : cEntity(etPickup, (((double)(a_MicroPosX)) / 32) + 0.1 /*Accomodate player vomiting*/, ((double)(a_MicroPosY)) / 32, ((double)(a_MicroPosZ)) / 32, 0.2, 0.2)
, m_Timer( 0.f )
, m_Item(a_Item)
, m_bCollected( false )
@@ -33,7 +33,7 @@ cPickup::cPickup(int a_MicroPosX, int a_MicroPosY, int a_MicroPosZ, const cItem
m_MaxHealth = 5;
m_Health = 5;
SetSpeed(a_SpeedX, a_SpeedY, a_SpeedZ);
- m_Gravity = -3.0;
+ m_Gravity = -10.0;
}