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

Updated ContainerHelpers to use new extensions (#2530)

Browse Source 
Co-authored-by: David Tan <>
This commit is contained in:
DTanxxx
2020-11-13 20:25:04 +13:00
committed by GitHub
parent 9f9bd3ade6
commit 69d709a28f
32 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/GameObjects/EntitySystems/BuckleSystem.cs
View File

@@ -86,8 +86,8 @@ namespace Content.Server.GameObjects.EntitySystems
return;
}
var contained = ContainerHelpers.TryGetContainer(buckle.Owner, out var ownContainer);
var strapContained = ContainerHelpers.TryGetContainer(strap.Owner, out var strapContainer);
var contained = buckle.Owner.TryGetContainer(out var ownContainer);
var strapContained = strap.Owner.TryGetContainer(out var strapContainer);
if (contained != strapContained || ownContainer != strapContainer)
{

6
Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
View File

@@ -329,19 +329,19 @@ namespace Content.Server.GameObjects.EntitySystems.Click
}
// If in a container
if (ContainerHelpers.IsInContainer(player))
if (player.IsInContainer())
{
return;
}
// In a container where the attacked entity is not the container's owner
if (ContainerHelpers.TryGetContainer(player, out var playerContainer) &&
if (player.TryGetContainer(out var playerContainer) &&
attacked != playerContainer.Owner)
{
// Either the attacked entity is null, not contained or in a different container
if (attacked == null ||
!ContainerHelpers.TryGetContainer(attacked, out var attackedContainer) ||
!attacked.TryGetContainer(out var attackedContainer) ||
attackedContainer != playerContainer)
{
return;