From 6b2e61bbc6b0e2d7ed65a5efaeef1f0cdb4d7587 Mon Sep 17 00:00:00 2001 From: BeaR Date: Sun, 16 Aug 2015 10:54:06 +0200 Subject: [PATCH] Fix collision bug with weapon projectiles Ignore characters, which can't collide e.g different teams, in the intersection test for projectiles. --- src/game/server/entities/projectile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/server/entities/projectile.cpp b/src/game/server/entities/projectile.cpp index dbc85ec1b..0147be5e6 100644 --- a/src/game/server/entities/projectile.cpp +++ b/src/game/server/entities/projectile.cpp @@ -120,7 +120,7 @@ void CProjectile::Tick() if(m_Owner >= 0) 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) m_LifeSpan--;