diff options
| author | Mattes D <github@xoft.cz> | 2020-04-13 18:38:06 +0200 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2020-04-16 22:07:48 +0200 |
| commit | 9ee47e59995f858ec531b3ee467f131594e4ba1f (patch) | |
| tree | f005d8af4a0362d7eab8a96a71aca0d73275f8e1 /src/Entities/Pickup.cpp | |
| parent | Prevent crash when breeding (diff) | |
| download | cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.gz cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.bz2 cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.lz cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.xz cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.tar.zst cuberite-9ee47e59995f858ec531b3ee467f131594e4ba1f.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Entities/Pickup.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Entities/Pickup.cpp b/src/Entities/Pickup.cpp index 1ab01c631..5c8d58f21 100644 --- a/src/Entities/Pickup.cpp +++ b/src/Entities/Pickup.cpp @@ -97,7 +97,7 @@ protected: // cPickup: cPickup::cPickup(Vector3d a_Pos, const cItem & a_Item, bool IsPlayerCreated, Vector3f a_Speed, int a_LifetimeTicks, bool a_CanCombine): - super(etPickup, a_Pos, 0.2, 0.2), + Super(etPickup, a_Pos, 0.2, 0.2), m_Timer(0), m_Item(a_Item), m_bCollected(false), @@ -127,7 +127,7 @@ void cPickup::SpawnOn(cClientHandle & a_Client) void cPickup::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) { - super::Tick(a_Dt, a_Chunk); + Super::Tick(a_Dt, a_Chunk); if (!IsTicking()) { // The base class tick destroyed us @@ -204,7 +204,7 @@ bool cPickup::DoTakeDamage(TakeDamageInfo & a_TDI) return true; } - return super::DoTakeDamage(a_TDI); + return Super::DoTakeDamage(a_TDI); } |