tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix disposals anchored test and fix disconnect method (#1545)

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-31 00:12:45 +02:00
committed by GitHub
parent bfe2217112
commit 7c1acf2fe1
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
View File

@@ -5,6 +5,7 @@ using Content.Server.GameObjects.Components;
using Content.Server.GameObjects.Components.Disposal; using Content.Server.GameObjects.Components.Disposal;
using Content.Server.GameObjects.Components.Power.ApcNetComponents; using Content.Server.GameObjects.Components.Power.ApcNetComponents;
using NUnit.Framework; using NUnit.Framework;
using Robust.Shared.GameObjects.Components;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC; using Robust.Shared.IoC;
@@ -85,10 +86,13 @@ namespace Content.IntegrationTests.Tests.Disposal
Assert.True(disposalTrunk.TryGetComponent(out entry)); Assert.True(disposalTrunk.TryGetComponent(out entry));
// Can't insert, unanchored and unpowered // Can't insert, unanchored and unpowered
var disposalUnitAnchorable = disposalUnit.GetComponent<AnchorableComponent>();
disposalUnitAnchorable.TryUnAnchor(human, null, true);
UnitInsertContains(unit, false, human, wrench, disposalUnit, disposalTrunk); UnitInsertContains(unit, false, human, wrench, disposalUnit, disposalTrunk);
Assert.False(unit.Anchored); Assert.False(unit.Anchored);
// Anchor the disposal unit // Anchor the disposal unit
disposalUnitAnchorable.TryAnchor(human, null, true);
Assert.True(disposalUnit.TryGetComponent(out AnchorableComponent anchorableUnit)); Assert.True(disposalUnit.TryGetComponent(out AnchorableComponent anchorableUnit));
Assert.True(anchorableUnit.TryAnchor(human, wrench)); Assert.True(anchorableUnit.TryAnchor(human, wrench));
Assert.True(unit.Anchored); Assert.True(unit.Anchored);

2
Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs
View File

@@ -156,7 +156,7 @@ namespace Content.Server.GameObjects.Components.Disposal
_connected = false; _connected = false;
foreach (var entity in Contents.ContainedEntities) foreach (var entity in Contents.ContainedEntities.ToArray())
{ {
if (!entity.TryGetComponent(out DisposalHolderComponent holder)) if (!entity.TryGetComponent(out DisposalHolderComponent holder))
{ {