Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix PermanentBlindnessComponent to be not so permanent #33292

Merged
merged 6 commits into from
Nov 30, 2024
Merged

fix PermanentBlindnessComponent to be not so permanent #33292

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
85bfa25
adjust min blindness back to 0 when PermanentBlindnessComponent is re…
Nov 13, 2024
8d6a1a6
mapinit changes
Nov 13, 2024
c7a3d56
remove OnRemove, move changes to OnShutdown
Nov 13, 2024
d42e4df
goodbye event
Nov 13, 2024
0df3b07
dependency removal
Nov 13, 2024
4912c40
final adjustment
Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace Content.Shared.Traits.Assorted;
public sealed class PermanentBlindnessSystem : EntitySystem
{
[Dependency] private readonly INetManager _net = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly BlindableSystem _blinding = default!;

/// <inheritdoc/>
Expand All @@ -33,20 +32,26 @@ private void OnExamined(Entity<PermanentBlindnessComponent> blindness, ref Exami

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)
{
if (!_entityManager.TryGetComponent<BlindableComponent>(blindness, out var blindable))
if(!TryComp<BlindableComponent>(blindness.Owner, out var blindable))
return;

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
{
var maxMagnitudeInt = (int) BlurryVisionComponent.MaxMagnitude;
_blinding.SetMinDamage(new Entity<BlindableComponent?>(blindness.Owner, blindable), maxMagnitudeInt);
_blinding.SetMinDamage((blindness.Owner, blindable), maxMagnitudeInt);
}
}
}
Loading