diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-10-24 01:30:20 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-10-24 01:30:20 +0200 |
| commit | 4d2c810c64c38fd5530170d5c4d54956a5587fb2 (patch) | |
| tree | 17c07b1a6eef15c83279f4530281bf7b986b06a3 /source/Entities/Pickup.cpp | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| download | cuberite-4d2c810c64c38fd5530170d5c4d54956a5587fb2.tar cuberite-4d2c810c64c38fd5530170d5c4d54956a5587fb2.tar.gz cuberite-4d2c810c64c38fd5530170d5c4d54956a5587fb2.tar.bz2 cuberite-4d2c810c64c38fd5530170d5c4d54956a5587fb2.tar.lz cuberite-4d2c810c64c38fd5530170d5c4d54956a5587fb2.tar.xz cuberite-4d2c810c64c38fd5530170d5c4d54956a5587fb2.tar.zst cuberite-4d2c810c64c38fd5530170d5c4d54956a5587fb2.zip | |
Diffstat (limited to 'source/Entities/Pickup.cpp')
| -rw-r--r-- | source/Entities/Pickup.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/Entities/Pickup.cpp b/source/Entities/Pickup.cpp index 075f93449..50431f52e 100644 --- a/source/Entities/Pickup.cpp +++ b/source/Entities/Pickup.cpp @@ -24,11 +24,12 @@ -cPickup::cPickup(double a_X, double a_Y, double a_Z, const cItem & a_Item, float a_SpeedX /* = 0.f */, float a_SpeedY /* = 0.f */, float a_SpeedZ /* = 0.f */) +cPickup::cPickup(double a_X, double a_Y, double a_Z, const cItem & a_Item, bool IsPlayerCreated, float a_SpeedX /* = 0.f */, float a_SpeedY /* = 0.f */, float a_SpeedZ /* = 0.f */) : cEntity(etPickup, a_X, a_Y, a_Z, 0.2, 0.2) , m_Timer( 0.f ) , m_Item(a_Item) , m_bCollected( false ) + , m_bIsPlayerCreated( IsPlayerCreated ) { m_MaxHealth = 5; m_Health = 5; @@ -126,8 +127,8 @@ bool cPickup::CollectedBy(cPlayer * a_Dest) return false; // It's already collected! } - // 800 is to long - if (m_Timer < 500.f) + // Two seconds if player created the pickup (vomiting), half a second if anything else + if (m_Timer < (m_bIsPlayerCreated ? 2000.f : 500.f)) { // LOG("Pickup %d cannot be collected by \"%s\", because it is not old enough.", m_UniqueID, a_Dest->GetName().c_str()); return false; // Not old enough |