From 4fe7801cfccbfa6f5a42ac2eb919287ef98ea611 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Tue, 25 Jun 2013 06:36:59 +0000 Subject: Unified the way mobs are spawned (egg vs natural). Fixed deadlocks in mob moving. Fixed mob destroying code. Should fix FS #400 and partially fix FS #381 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1626 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Pickup.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/Pickup.cpp') diff --git a/source/Pickup.cpp b/source/Pickup.cpp index 19959efa3..6d0f0aa0e 100644 --- a/source/Pickup.cpp +++ b/source/Pickup.cpp @@ -93,7 +93,7 @@ void cPickup::Tick(float a_Dt, cChunk & a_Chunk) m_Timer += a_Dt; // In case we have to destroy the pickup in the same tick. if (m_Timer > 500.f) { - Destroy(); + Destroy(true); return; } } @@ -104,20 +104,20 @@ void cPickup::Tick(float a_Dt, cChunk & a_Chunk) { if (m_Timer > 500.f) // 0.5 second { - Destroy(); + Destroy(true); return; } } if (m_Timer > 1000 * 60 * 5) // 5 minutes { - Destroy(); + Destroy(true); return; } if (GetPosY() < -8) // Out of this world and no more visible! { - Destroy(); + Destroy(true); return; } } -- cgit v1.2.3