Content update for UI prediction (#27214)
* Content update for UI refactor * Big update * Sharing * Remaining content updates * First big update * Prototype updates * AUGH * Fix UI comp ref * Cleanup - Fix predicted message, fix item slots, fix interaction range check. * Fix regressions * Make this predictive idk why it wasn't. * Fix slime merge * Merge conflict * Fix merge
This commit is contained in:
@@ -90,7 +90,7 @@ public sealed class SurveillanceCameraMonitorSystem : EntitySystem
|
||||
private void OnSubnetRequest(EntityUid uid, SurveillanceCameraMonitorComponent component,
|
||||
SurveillanceCameraMonitorSubnetRequestMessage args)
|
||||
{
|
||||
if (args.Session.AttachedEntity != null)
|
||||
if (args.Actor != null)
|
||||
{
|
||||
SetActiveSubnet(uid, args.Subnet, component);
|
||||
}
|
||||
@@ -208,13 +208,9 @@ public sealed class SurveillanceCameraMonitorSystem : EntitySystem
|
||||
|
||||
private void OnBoundUiClose(EntityUid uid, SurveillanceCameraMonitorComponent component, BoundUIClosedEvent args)
|
||||
{
|
||||
if (args.Session.AttachedEntity == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
RemoveViewer(uid, args.Session.AttachedEntity.Value, component);
|
||||
RemoveViewer(uid, args.Actor, component);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private void SendHeartbeat(EntityUid uid, SurveillanceCameraMonitorComponent? monitor = null)
|
||||
@@ -487,6 +483,6 @@ public sealed class SurveillanceCameraMonitorSystem : EntitySystem
|
||||
}
|
||||
|
||||
var state = new SurveillanceCameraMonitorUiState(GetNetEntity(monitor.ActiveCamera), monitor.KnownSubnets.Keys.ToHashSet(), monitor.ActiveCameraAddress, monitor.ActiveSubnet, monitor.KnownCameras);
|
||||
_userInterface.TrySetUiState(uid, SurveillanceCameraMonitorUiKey.Key, state);
|
||||
_userInterface.SetUiState(uid, SurveillanceCameraMonitorUiKey.Key, state);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user