From 17c091a97f35ac4fceb6facea1b65588f498e3a0 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Fri, 9 Apr 2021 23:19:50 +0100 Subject: Fix thrown snowball/egg hit animations + Snowballs destroy ender crystals --- src/Entities/ThrownEggEntity.h | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'src/Entities/ThrownEggEntity.h') diff --git a/src/Entities/ThrownEggEntity.h b/src/Entities/ThrownEggEntity.h index f6240a680..f20705b81 100644 --- a/src/Entities/ThrownEggEntity.h +++ b/src/Entities/ThrownEggEntity.h @@ -30,23 +30,13 @@ public: // tolua_export cThrownEggEntity(cEntity * a_Creator, Vector3d a_Pos, Vector3d a_Speed); -protected: - - // cProjectileEntity overrides: - virtual void OnHitSolidBlock(Vector3d a_HitPos, eBlockFace a_HitFace) override; - virtual void OnHitEntity(cEntity & a_EntityHit, Vector3d a_HitPos) override; - virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override; +private: - // Randomly decides whether to spawn a chicken where the egg lands. + /** Randomly decides whether to spawn a chicken where the egg lands. */ void TrySpawnChicken(Vector3d a_HitPos); -private: - - /** Time in ticks to wait for the hit animation to begin before destroying */ - int m_DestroyTimer; + // cProjectileEntity overrides: + virtual void OnHitEntity(cEntity & a_EntityHit, Vector3d a_HitPos) override; + virtual void OnHitSolidBlock(Vector3d a_HitPos, eBlockFace a_HitFace) override; } ; // tolua_export - - - - -- cgit v1.2.3