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

fix: EyeOffset when eyes are closed (#38534)

Browse Source 
* fix: EyeOffset when eyes are closed

* fix: Relay only blocked on eyes closed action

* cleanup: whitespace

* fix: missing cancel on PVS, dependencies

* remove: namespace import

* change: apply from review

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
Łukasz Mędrek
2025-06-25 20:22:05 +00:00
committed by GitHub
parent 433893679e
commit 1ba0191808
4 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Shared/Movement/Systems/SharedContentEyeSystem.cs
View File

@@ -142,6 +142,15 @@ public abstract class SharedContentEyeSystem : EntitySystem
public void UpdateEyeOffset(Entity<EyeComponent> eye)
{
var evAttempt = new GetEyeOffsetAttemptEvent();
RaiseLocalEvent(eye, ref evAttempt);
if (evAttempt.Cancelled)
{
_eye.SetOffset(eye, Vector2.Zero, eye);
return;
}
var ev = new GetEyeOffsetEvent();
RaiseLocalEvent(eye, ref ev);
@@ -156,6 +165,15 @@ public abstract class SharedContentEyeSystem : EntitySystem
if (!Resolve(uid, ref contentEye) || !Resolve(uid, ref eye))
return;
var evAttempt = new GetEyePvsScaleAttemptEvent();
RaiseLocalEvent(uid, ref evAttempt);
if (evAttempt.Cancelled)
{
_eye.SetPvsScale((uid, eye), 1);
return;
}
var ev = new GetEyePvsScaleEvent();
RaiseLocalEvent(uid, ref ev);