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

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))