diff options
| author | madmaxoft <github@xoft.cz> | 2013-09-15 20:49:08 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-09-15 20:49:08 +0200 |
| commit | 5cde7d8a29b38360ae36f9e8c5210bee07fce612 (patch) | |
| tree | 816bbb5c99b9ac3ce64920ccc9e6abd88519c022 /source/Entities/Pickup.cpp | |
| parent | Merge branch 'bugfixes' of git://github.com/tigerw/MCServer into tigerw-bugfixes (diff) | |
| parent | Added break (diff) | |
| download | cuberite-5cde7d8a29b38360ae36f9e8c5210bee07fce612.tar cuberite-5cde7d8a29b38360ae36f9e8c5210bee07fce612.tar.gz cuberite-5cde7d8a29b38360ae36f9e8c5210bee07fce612.tar.bz2 cuberite-5cde7d8a29b38360ae36f9e8c5210bee07fce612.tar.lz cuberite-5cde7d8a29b38360ae36f9e8c5210bee07fce612.tar.xz cuberite-5cde7d8a29b38360ae36f9e8c5210bee07fce612.tar.zst cuberite-5cde7d8a29b38360ae36f9e8c5210bee07fce612.zip | |
Diffstat (limited to 'source/Entities/Pickup.cpp')
| -rw-r--r-- | source/Entities/Pickup.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/Entities/Pickup.cpp b/source/Entities/Pickup.cpp index 9b388366a..db7be8b04 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,6 @@ 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; } |