tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix PermanentBlindnessComponent to be not so permanent (#33292)

Browse Source 
* adjust min blindness back to 0 when PermanentBlindnessComponent is removed

* mapinit changes

* remove OnRemove, move changes to OnShutdown

* goodbye event

* dependency removal

* final adjustment

---------

Co-authored-by: lunarcomets <luanrcomets2@gmail,com>
This commit is contained in:
lunarcomets
2024-11-29 18:56:52 -08:00
committed by GitHub
parent e9ef00f475
commit b45c9d5129
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
View File

@@ -12,7 +12,6 @@ namespace Content.Shared.Traits.Assorted;
public sealed class PermanentBlindnessSystem : EntitySystem public sealed class PermanentBlindnessSystem : EntitySystem
{ {
[Dependency] private readonly INetManager _net = default!; [Dependency] private readonly INetManager _net = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly BlindableSystem _blinding = default!; [Dependency] private readonly BlindableSystem _blinding = default!;
/// <inheritdoc/> /// <inheritdoc/>
@@ -33,20 +32,26 @@ public sealed class PermanentBlindnessSystem : EntitySystem
private void OnShutdown(Entity<PermanentBlindnessComponent> blindness, ref ComponentShutdown args) private void OnShutdown(Entity<PermanentBlindnessComponent> blindness, ref ComponentShutdown args)
{ {
_blinding.UpdateIsBlind(blindness.Owner); if (!TryComp<BlindableComponent>(blindness.Owner, out var blindable))
return;
if (blindable.MinDamage != 0)
{
_blinding.SetMinDamage((blindness.Owner, blindable), 0);
}
} }
private void OnMapInit(Entity<PermanentBlindnessComponent> blindness, ref MapInitEvent args) private void OnMapInit(Entity<PermanentBlindnessComponent> blindness, ref MapInitEvent args)
{ {
if (!_entityManager.TryGetComponent<BlindableComponent>(blindness, out var blindable)) if(!TryComp<BlindableComponent>(blindness.Owner, out var blindable))
return; return;
if (blindness.Comp.Blindness != 0) if (blindness.Comp.Blindness != 0)
_blinding.SetMinDamage(new Entity<BlindableComponent?>(blindness.Owner, blindable), blindness.Comp.Blindness); _blinding.SetMinDamage((blindness.Owner, blindable), blindness.Comp.Blindness);
else else
{ {
var maxMagnitudeInt = (int) BlurryVisionComponent.MaxMagnitude; var maxMagnitudeInt = (int) BlurryVisionComponent.MaxMagnitude;
_blinding.SetMinDamage(new Entity<BlindableComponent?>(blindness.Owner, blindable), maxMagnitudeInt); _blinding.SetMinDamage((blindness.Owner, blindable), maxMagnitudeInt);
} }
} }
} }