diff options
| author | archshift <admin@archshift.com> | 2014-04-25 04:16:16 +0200 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-04-25 04:16:16 +0200 |
| commit | ec9787bae21f92251a38338ae5823aa851c5efea (patch) | |
| tree | d29b912cee50cc35d8a0891e78af45951ce16115 /src/Entities/ProjectileEntity.h | |
| parent | Fixed class capitalization for the cave spider. (diff) | |
| download | cuberite-ec9787bae21f92251a38338ae5823aa851c5efea.tar cuberite-ec9787bae21f92251a38338ae5823aa851c5efea.tar.gz cuberite-ec9787bae21f92251a38338ae5823aa851c5efea.tar.bz2 cuberite-ec9787bae21f92251a38338ae5823aa851c5efea.tar.lz cuberite-ec9787bae21f92251a38338ae5823aa851c5efea.tar.xz cuberite-ec9787bae21f92251a38338ae5823aa851c5efea.tar.zst cuberite-ec9787bae21f92251a38338ae5823aa851c5efea.zip | |
Diffstat (limited to 'src/Entities/ProjectileEntity.h')
| -rw-r--r-- | src/Entities/ProjectileEntity.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/Entities/ProjectileEntity.h b/src/Entities/ProjectileEntity.h index efb7ae783..002aa09a1 100644 --- a/src/Entities/ProjectileEntity.h +++ b/src/Entities/ProjectileEntity.h @@ -166,6 +166,9 @@ protected: /// Timer for client arrow position confirmation via TeleportEntity float m_HitGroundTimer; + + // Whether the arrow has already been teleported into the proper position in the ground. + bool m_HasTeleported; /// If true, the arrow is in the process of being collected - don't go to anyone else bool m_bIsCollected; @@ -205,7 +208,10 @@ protected: // cProjectileEntity overrides: virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override; - + virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override; + + void TryForChicken(const Vector3d & a_HitPos); + // tolua_begin } ; @@ -233,6 +239,9 @@ protected: // cProjectileEntity overrides: virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override; + virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override; + + void TeleportUser(const Vector3d & a_HitPos); // tolua_begin |