mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-20 09:34:19 +00:00
Merge pull request #287 from cinaera/pr_weapon_coll
Fix collision bug with weapon projectiles
This commit is contained in:
commit
3c0b9af1b4
|
@ -120,7 +120,7 @@ void CProjectile::Tick()
|
||||||
if(m_Owner >= 0)
|
if(m_Owner >= 0)
|
||||||
pOwnerChar = GameServer()->GetPlayerChar(m_Owner);
|
pOwnerChar = GameServer()->GetPlayerChar(m_Owner);
|
||||||
|
|
||||||
CCharacter *pTargetChr = GameServer()->m_World.IntersectCharacter(PrevPos, ColPos, m_Freeze ? 1.0f : 6.0f, ColPos, pOwnerChar);
|
CCharacter *pTargetChr = GameServer()->m_World.IntersectCharacter(PrevPos, ColPos, m_Freeze ? 1.0f : 6.0f, ColPos, pOwnerChar, m_Owner);
|
||||||
|
|
||||||
if(m_LifeSpan > -1)
|
if(m_LifeSpan > -1)
|
||||||
m_LifeSpan--;
|
m_LifeSpan--;
|
||||||
|
|
Loading…
Reference in a new issue