From 68e76487d6c8cc097b85fd626e8f4f385cde27b1 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Sun, 4 May 2025 23:21:09 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B0=D0=BF?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B8=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Shared/Construction/Steps/TagConstructionGraphStep.cs | 4 +++- Content.Shared/Weapons/Reflect/ReflectSystem.cs | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Content.Shared/Construction/Steps/TagConstructionGraphStep.cs b/Content.Shared/Construction/Steps/TagConstructionGraphStep.cs index d67456aa1e..df8c166aa1 100644 --- a/Content.Shared/Construction/Steps/TagConstructionGraphStep.cs +++ b/Content.Shared/Construction/Steps/TagConstructionGraphStep.cs @@ -5,11 +5,13 @@ namespace Content.Shared.Construction.Steps [DataDefinition] public sealed partial class TagConstructionGraphStep : ArbitraryInsertConstructionGraphStep { + [DataField("tag")] + private string? _tag; public override bool EntityValid(EntityUid uid, IEntityManager entityManager, IComponentFactory compFactory) { var tagSystem = entityManager.EntitySysManager.GetEntitySystem(); - return !string.IsNullOrEmpty(Tag) && tagSystem.HasTag(uid, Tag); + return !string.IsNullOrEmpty(_tag) && tagSystem.HasTag(uid, _tag); } } } diff --git a/Content.Shared/Weapons/Reflect/ReflectSystem.cs b/Content.Shared/Weapons/Reflect/ReflectSystem.cs index 0913058c24..bfa2d5c4e0 100644 --- a/Content.Shared/Weapons/Reflect/ReflectSystem.cs +++ b/Content.Shared/Weapons/Reflect/ReflectSystem.cs @@ -152,7 +152,7 @@ public sealed class ReflectSystem : EntitySystem projectile.Comp.Weapon = user; Dirty(projectile, projectile.Comp); - var reflectedEv = new ReflectedEvent(projectile.Comp.Shooter, projectileComp.Weapon.Value, projectileComp.Damage, reflective.Reflective); + var reflectedEv = new ReflectedEvent(projectile.Comp.Shooter, projectile.Comp.Weapon.Value, projectile.Comp.Damage, reflective.Reflective); RaiseLocalEvent(reflector, reflectedEv); } else @@ -180,7 +180,7 @@ public sealed class ReflectSystem : EntitySystem } if (reflector.Comp.Slot != null && - !_inventorySystem.TryGetSlotEntity(user, reflect.Slot, out var slotEntity) && + !_inventorySystem.TryGetSlotEntity(user, reflector.Comp.Slot, out var slotEntity) && slotEntity != reflector) { newDirection = null;