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

Refactor collision to use hard instead of a workaround (#1677)

Browse Source
This commit is contained in:
ShadowCommander
2020-08-15 07:07:09 -07:00
committed by GitHub
parent 845f5af7d0
commit 915631d51c
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs
View File

@@ -10,7 +10,6 @@ using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Verbs; using Content.Shared.GameObjects.Verbs;
using Content.Shared.Interfaces; using Content.Shared.Interfaces;
using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Interfaces.GameObjects.Components;
using Content.Shared.Physics;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.Components.Container;
using Robust.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.EntitySystems;
@@ -50,8 +49,6 @@ namespace Content.Server.GameObjects.Components.Items.Storage
private bool _occludesLight; private bool _occludesLight;
private bool _open; private bool _open;
private bool _isWeldedShut; private bool _isWeldedShut;
private int _collisionMaskStorage;
private int _collisionLayerStorage;
[ViewVariables] [ViewVariables]
protected Container Contents; protected Container Contents;
@@ -202,18 +199,13 @@ namespace Content.Server.GameObjects.Components.Items.Storage
{ {
if (!_isCollidableWhenOpen && Owner.TryGetComponent<ICollidableComponent>(out var collidableComponent)) if (!_isCollidableWhenOpen && Owner.TryGetComponent<ICollidableComponent>(out var collidableComponent))
{ {
var physShape = collidableComponent.PhysicsShapes[0];
if (Open) if (Open)
{ {
_collisionMaskStorage = physShape.CollisionMask; collidableComponent.Hard = false;
physShape.CollisionMask = (int)CollisionGroup.Impassable;
_collisionLayerStorage = physShape.CollisionLayer;
physShape.CollisionLayer = (int)CollisionGroup.None;
} }
else else
{ {
physShape.CollisionMask = _collisionMaskStorage; collidableComponent.Hard = true;
physShape.CollisionLayer = _collisionLayerStorage;
} }
} }