rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

фиксы апстрима

Browse source
This commit is contained in:
Vigers Ray 2025-05-04 23:21:09 +03:00
parent 95b86d7a4b
commit 68e76487d6
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Content.Shared/Construction/Steps/TagConstructionGraphStep.cs
View file

@ -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<TagSystem>();
return !string.IsNullOrEmpty(Tag) && tagSystem.HasTag(uid, Tag);
return !string.IsNullOrEmpty(_tag) && tagSystem.HasTag(uid, _tag);
}
}
}

4
Content.Shared/Weapons/Reflect/ReflectSystem.cs
View file

@ -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;