From 0796ca7beebdffa5c05ee4ff0398037c1cf5a34e Mon Sep 17 00:00:00 2001 From: CaYpeN1 Date: Mon, 25 Mar 2024 14:40:56 +0500 Subject: [PATCH] change --- .../WeaponModules/WeaponModulesSystem.cs | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs b/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs index f70a4dbaf3..b2455b2046 100644 --- a/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs +++ b/Content.Server/_White/WeaponModules/WeaponModulesSystem.cs @@ -34,36 +34,38 @@ public sealed class WeaponModulesSystem : EntitySystem SubscribeLocalEvent(AcceleratorModuleOnInsert); SubscribeLocalEvent(AcceleratorModuleOnEject); } - private bool TryInsertModule(EntityUid module, EntityUid weapon, BaseModuleComponent component, EntGotInsertedIntoContainerMessage args, [NotNullWhen(true)] out WeaponModulesComponent? weaponModulesComponent) + private bool TryInsertModule(EntityUid module, EntityUid weapon, BaseModuleComponent component, + EntGotInsertedIntoContainerMessage args, [NotNullWhen(true)] out WeaponModulesComponent? weaponModulesComponent, + [NotNullWhen(true)] out AppearanceComponent? appearanceComponent) { - if (!TryComp(weapon, out var weaponModulesComponents) || !TryComp(weapon, out var appearanceComponent) || ModulesSlot != args.Container.ID) + if (!TryComp(weapon, out weaponModulesComponent) || !TryComp(weapon, out appearanceComponent) || + ModulesSlot != args.Container.ID) { weaponModulesComponent = null; appearanceComponent = null; return false; } - if(!weaponModulesComponents.Modules.Contains(module)) - weaponModulesComponents.Modules.Add(module); + if(!weaponModulesComponent.Modules.Contains(module)) + weaponModulesComponent.Modules.Add(module); _appearanceSystem.SetData(weapon, ModuleVisualState.Module, component.AppearanceValue, appearanceComponent); - weaponModulesComponent = weaponModulesComponents; return true; } - private bool TryEjectModule(EntityUid module, EntityUid weapon, EntGotRemovedFromContainerMessage args, [NotNullWhen(true)] out WeaponModulesComponent? weaponModulesComponent) + private bool TryEjectModule(EntityUid module, EntityUid weapon, EntGotRemovedFromContainerMessage args, [NotNullWhen(true)] out WeaponModulesComponent? weaponModulesComponent, [NotNullWhen(true)] out AppearanceComponent? appearanceComponent) { - if (!TryComp(weapon, out var weaponModulesComponents) || !TryComp(weapon, out var appearanceComponent) || ModulesSlot != args.Container.ID) + if (!TryComp(weapon, out weaponModulesComponent) || !TryComp(weapon, out appearanceComponent) || ModulesSlot != args.Container.ID) { weaponModulesComponent = null; appearanceComponent = null; return false; } - if(weaponModulesComponents.Modules.Contains(module)) - weaponModulesComponents.Modules.Remove(module); + if(weaponModulesComponent.Modules.Contains(module)) + weaponModulesComponent.Modules.Remove(module); _appearanceSystem.SetData(weapon, ModuleVisualState.Module, "none", appearanceComponent); - weaponModulesComponent = weaponModulesComponents; + return true; } @@ -72,11 +74,9 @@ public sealed class WeaponModulesSystem : EntitySystem { EntityUid weapon = args.Container.Owner; - if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent)) + if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent, out var appearanceComponent)) return; - if(!TryComp(weapon, out var appearanceComponent)) return; - _lightSystem.EnsureLight(weapon); _lightSystem.TryGetLight(weapon, out var light); @@ -90,7 +90,7 @@ public sealed class WeaponModulesSystem : EntitySystem { EntityUid weapon = args.Container.Owner; - if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent)) + if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent, out var appearanceComponent)) return; if (!TryComp(weapon, out var gunComp)) return; @@ -104,7 +104,7 @@ public sealed class WeaponModulesSystem : EntitySystem { EntityUid weapon = args.Container.Owner; - if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent)) + if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent, out var appearanceComponent)) return; weaponModulesComponent.UseEffect = true; @@ -115,7 +115,7 @@ public sealed class WeaponModulesSystem : EntitySystem { EntityUid weapon = args.Container.Owner; - if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent)) + if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent, out var appearanceComponent)) return; if (!TryComp(weapon, out var gunComp)) return; @@ -132,7 +132,7 @@ public sealed class WeaponModulesSystem : EntitySystem { EntityUid weapon = args.Container.Owner; - if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent)) + if(!TryInsertModule(module, weapon, component, args, out var weaponModulesComponent, out var appearanceComponent)) return; if (!TryComp(weapon, out var gunComp)) return; @@ -148,7 +148,7 @@ public sealed class WeaponModulesSystem : EntitySystem { EntityUid weapon = args.Container.Owner; - if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent)) + if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent, out var appearanceComponent)) return; _lightSystem.TryGetLight(weapon, out var light); @@ -160,7 +160,7 @@ public sealed class WeaponModulesSystem : EntitySystem { EntityUid weapon = args.Container.Owner; - if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent)) + if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent, out var appearanceComponent)) return; _gunSystem.SetProjectileSpeed(weapon, component.OldProjectileSpeed); @@ -170,7 +170,7 @@ public sealed class WeaponModulesSystem : EntitySystem { EntityUid weapon = args.Container.Owner; - if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent)) + if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent, out var appearanceComponent)) return; weaponModulesComponent.UseEffect = false; @@ -181,7 +181,7 @@ public sealed class WeaponModulesSystem : EntitySystem { EntityUid weapon = args.Container.Owner; - if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent)) + if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent, out var appearanceComponent)) return; weaponModulesComponent.UseEffect = false; @@ -193,7 +193,7 @@ public sealed class WeaponModulesSystem : EntitySystem { EntityUid weapon = args.Container.Owner; - if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent)) + if(!TryEjectModule(module, weapon, args, out var weaponModulesComponent, out var appearanceComponent)) return; _gunSystem.SetFireRate(weapon, component.OldFireRate);