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

Stop using some obsolete stuff (#4657)

Browse Source
This commit is contained in:
Visne
2021-09-20 08:40:22 +02:00
committed by GitHub
parent 3895266b1f
commit fcc1217e5d
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Explosion/ExplosionHelper.cs
View File

@@ -84,7 +84,7 @@ namespace Content.Server.Explosion
// and splitted into two lists based on if they are Impassable or not
foreach (var entity in entitiesInRange)
{
if (entity.Deleted || !entity.Transform.IsMapTransform)
if (entity.Deleted || entity.IsInContainer())
{
continue;
}

8
Content.Server/Storage/Components/ServerStorageComponent.cs
View File

@@ -404,7 +404,7 @@ namespace Content.Server.Storage.Components
var playerTransform = player.Transform;
if (!playerTransform.Coordinates.InRange(Owner.EntityManager, ownerTransform.Coordinates, 2) ||
!ownerTransform.IsMapTransform && !playerTransform.ContainsEntity(ownerTransform))
Owner.IsInContainer() && !playerTransform.ContainsEntity(ownerTransform))
{
break;
}
@@ -515,7 +515,7 @@ namespace Content.Server.Storage.Components
var validStorables = new List<IEntity>();
foreach (var entity in IoCManager.Resolve<IEntityLookup>().GetEntitiesInRange(eventArgs.ClickLocation, 1))
{
if (!entity.Transform.IsMapTransform
if (entity.IsInContainer()
|| entity == eventArgs.User
|| !entity.HasComponent<SharedItemComponent>())
continue;
@@ -542,7 +542,7 @@ namespace Content.Server.Storage.Components
foreach (var entity in validStorables)
{
// Check again, situation may have changed for some entities, but we'll still pick up any that are valid
if (!entity.Transform.IsMapTransform
if (entity.IsInContainer()
|| entity == eventArgs.User
|| !entity.HasComponent<SharedItemComponent>())
continue;
@@ -571,7 +571,7 @@ namespace Content.Server.Storage.Components
else if (_quickInsert)
{
if (eventArgs.Target == null
|| !eventArgs.Target.Transform.IsMapTransform
|| eventArgs.Target.IsInContainer()
|| eventArgs.Target == eventArgs.User
|| !eventArgs.Target.HasComponent<SharedItemComponent>())
return false;

3
Content.Server/Weapon/Melee/MeleeWeaponSystem.cs
View File

@@ -12,6 +12,7 @@ using Content.Shared.Interaction;
using Content.Shared.Physics;
using Content.Shared.Weapons.Melee;
using Robust.Shared.Audio;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
@@ -128,7 +129,7 @@ namespace Content.Server.Weapon.Melee
var hitEntities = new List<IEntity>();
foreach (var entity in entities)
{
if (!entity.Transform.IsMapTransform || entity == args.User)
if (entity.IsInContainer() || entity == args.User)
continue;
if (ComponentManager.HasComponent<DamageableComponent>(entity.Uid))