diff options
Diffstat (limited to 'source/Entities/ProjectileEntity.cpp')
| -rw-r--r-- | source/Entities/ProjectileEntity.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/Entities/ProjectileEntity.cpp b/source/Entities/ProjectileEntity.cpp index ed7803410..8bc9abdb0 100644 --- a/source/Entities/ProjectileEntity.cpp +++ b/source/Entities/ProjectileEntity.cpp @@ -85,9 +85,13 @@ public: virtual bool Item(cEntity * a_Entity) override { - if (a_Entity == m_Projectile) + if ( + (a_Entity == m_Projectile) || // Do not check collisions with self + (a_Entity == m_Projectile->GetCreator()) // Do not check whoever shot the projectile + ) { - // Self-colision + // TODO: Don't check creator only for the first 5 ticks + // so that arrows stuck in ground and dug up can hurt the player return false; } |