Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix thrown items not colliding with walls.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-04-25 14:43:41 +02:00
parent 8e91215d6f
commit 4c08e66254
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Throw/ThrowHelper.cs
View File

@@ -21,8 +21,6 @@ namespace Content.Server.Throw
{ {
public static void Throw(IEntity thrownEnt, float throwForce, GridCoordinates targetLoc, GridCoordinates sourceLoc, bool spread = false, IEntity throwSourceEnt = null) public static void Throw(IEntity thrownEnt, float throwForce, GridCoordinates targetLoc, GridCoordinates sourceLoc, bool spread = false, IEntity throwSourceEnt = null)
{ {
if (!thrownEnt.TryGetComponent(out CollidableComponent colComp)) if (!thrownEnt.TryGetComponent(out CollidableComponent colComp))
return; return;
@@ -38,7 +36,7 @@ namespace Content.Server.Throw
if (colComp.PhysicsShapes.Count == 0) if (colComp.PhysicsShapes.Count == 0)
colComp.PhysicsShapes.Add(new PhysShapeAabb()); colComp.PhysicsShapes.Add(new PhysShapeAabb());
colComp.PhysicsShapes[0].CollisionMask |= (int) CollisionGroup.MobImpassable; colComp.PhysicsShapes[0].CollisionMask |= (int) (CollisionGroup.MobImpassable | CollisionGroup.Impassable);
colComp.IsScrapingFloor = false; colComp.IsScrapingFloor = false;
} }
var angle = new Angle(targetLoc.ToMapPos(mapManager) - sourceLoc.ToMapPos(mapManager)); var angle = new Angle(targetLoc.ToMapPos(mapManager) - sourceLoc.ToMapPos(mapManager));