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

Fix entity storage masks (#7844)

Browse Source
This commit is contained in:
Leon Friedrich
2022-05-01 09:27:07 +12:00
committed by GitHub
parent f3e8452228
commit d261888b48
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Content.Server/Storage/Components/EntityStorageComponent.cs
View File

@@ -19,15 +19,9 @@ using Content.Shared.Storage;
using Content.Shared.Tools;
using Robust.Shared.Audio;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Player;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.ViewVariables;
namespace Content.Server.Storage.Components
{
@@ -44,11 +38,19 @@ namespace Content.Server.Storage.Components
public static readonly TimeSpan InternalOpenAttemptDelay = TimeSpan.FromSeconds(0.5);
public TimeSpan LastInternalOpenAttempt;
private const int OpenMask = (int) (
/// <summary>
/// Collision masks that get removed when the storage gets opened.
/// </summary>
private const int MasksToRemove = (int) (
CollisionGroup.MobImpassable |
CollisionGroup.VaultImpassable |
CollisionGroup.SmallImpassable);
/// <summary>
/// Collision masks that were removed from ANY layer when the storage was opened;
/// </summary>
[DataField("removedMasks")] public int RemovedMasks;
[ViewVariables]
[DataField("Capacity")]
private int _storageCapacityMax = 30;
@@ -312,21 +314,24 @@ namespace Content.Server.Storage.Components
private void ModifyComponents()
{
if (!_isCollidableWhenOpen && _entMan.TryGetComponent<FixturesComponent?>(Owner, out var manager))
if (!_isCollidableWhenOpen && _entMan.TryGetComponent<FixturesComponent?>(Owner, out var manager)
&& manager.Fixtures.Count > 0)
{
// currently only works for single-fixture entities. If they have more than one fixture, then
// RemovedMasks needs to be tracked separately for each fixture, using a fixture Id Dictionary. Also the
// fixture IDs probably cant be automatically generated without causing issues, unless there is some
// guarantee that they will get deserialized with the same auto-generated ID when saving+loading the map.
var fixture = manager.Fixtures.Values.First();
if (Open)
{
foreach (var (_, fixture) in manager.Fixtures)
{
fixture.CollisionLayer &= ~OpenMask;
}
RemovedMasks = fixture.CollisionLayer & MasksToRemove;
fixture.CollisionLayer &= ~MasksToRemove;
}
else
{
foreach (var (_, fixture) in manager.Fixtures)
{
fixture.CollisionLayer |= OpenMask;
}
fixture.CollisionLayer |= RemovedMasks;
RemovedMasks = 0;
}
}