Fixed projectiles colliding with railguns due to 1e02d74
This commit is contained in:
@@ -188,6 +188,8 @@ namespace Barotrauma.Items.Components
|
||||
{
|
||||
if (fixture == null || fixture.IsSensor) return -1;
|
||||
|
||||
if (fixture.UserData is Item) return -1;
|
||||
|
||||
if (!fixture.CollisionCategories.HasFlag(Physics.CollisionCharacter) &&
|
||||
!fixture.CollisionCategories.HasFlag(Physics.CollisionWall) &&
|
||||
!fixture.CollisionCategories.HasFlag(Physics.CollisionLevel)) return -1;
|
||||
@@ -291,6 +293,8 @@ namespace Barotrauma.Items.Components
|
||||
|
||||
if (IgnoredBodies.Contains(target.Body)) return false;
|
||||
|
||||
if (target.UserData is Item) return false;
|
||||
|
||||
if (target.CollisionCategories == Physics.CollisionCharacter && !(target.Body.UserData is Limb))
|
||||
{
|
||||
return false;
|
||||
|
||||
@@ -46,7 +46,7 @@ namespace Barotrauma
|
||||
|
||||
public PhysicsBody body;
|
||||
|
||||
public readonly XElement staticBodyConfig;
|
||||
public readonly XElement StaticBodyConfig;
|
||||
|
||||
private Vector2 lastSentPos;
|
||||
private bool prevBodyAwake;
|
||||
@@ -402,7 +402,7 @@ namespace Barotrauma
|
||||
case "brokensprite":
|
||||
break;
|
||||
case "staticbody":
|
||||
staticBodyConfig = subElement;
|
||||
StaticBodyConfig = subElement;
|
||||
break;
|
||||
case "aitarget":
|
||||
aiTarget = new AITarget(this);
|
||||
|
||||
Reference in New Issue
Block a user