summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-01-24 22:55:04 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-01-24 22:55:04 +0100
commita988063915aa288bf0183509783987941574e2ae (patch)
tree6b458c94b769bf9e550296c1564aad9787768a58 /src/Entities
parentChanged a condition to IsGameMode (diff)
downloadcuberite-a988063915aa288bf0183509783987941574e2ae.tar
cuberite-a988063915aa288bf0183509783987941574e2ae.tar.gz
cuberite-a988063915aa288bf0183509783987941574e2ae.tar.bz2
cuberite-a988063915aa288bf0183509783987941574e2ae.tar.lz
cuberite-a988063915aa288bf0183509783987941574e2ae.tar.xz
cuberite-a988063915aa288bf0183509783987941574e2ae.tar.zst
cuberite-a988063915aa288bf0183509783987941574e2ae.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Pickup.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/Entities/Pickup.cpp b/src/Entities/Pickup.cpp
index 001e386a7..55c878b57 100644
--- a/src/Entities/Pickup.cpp
+++ b/src/Entities/Pickup.cpp
@@ -6,30 +6,24 @@
#endif
#include "Pickup.h"
+#include "Player.h"
#include "../ClientHandle.h"
-#include "../Inventory.h"
#include "../World.h"
-#include "../Simulator/FluidSimulator.h"
#include "../Server.h"
-#include "Player.h"
#include "../Bindings/PluginManager.h"
-#include "../Item.h"
#include "../Root.h"
#include "../Chunk.h"
-#include "../Vector3d.h"
-#include "../Vector3f.h"
-
cPickup::cPickup(double a_PosX, double a_PosY, double a_PosZ, const cItem & a_Item, bool IsPlayerCreated, float a_SpeedX /* = 0.f */, float a_SpeedY /* = 0.f */, float a_SpeedZ /* = 0.f */)
: cEntity(etPickup, a_PosX, a_PosY, a_PosZ, 0.2, 0.2)
- , m_Timer( 0.f )
+ , m_Timer(0.f)
, m_Item(a_Item)
- , m_bCollected( false )
- , m_bIsPlayerCreated( IsPlayerCreated )
+ , m_bCollected(false)
+ , m_bIsPlayerCreated(IsPlayerCreated)
{
SetGravity(-10.5f);
SetMaxHealth(5);