Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Misc state handling changes (#9265)

Browse Source 
* misc state handling changes

* ambient dirtying
This commit is contained in:
Leon Friedrich
2022-06-29 15:11:09 +12:00
committed by GitHub
parent 9064360fbc
commit 8df89bd055
8 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Client/Actions/ActionsSystem.cs
View File

@@ -131,10 +131,6 @@ namespace Content.Client.Actions
private void HandleState(EntityUid uid, ActionsComponent component, ref ComponentHandleState args)
{
// Client only needs to care about local player.
if (uid != _playerManager.LocalPlayer?.ControlledEntity)
return;
if (args.Current is not ActionsComponentState state)
return;
@@ -207,14 +203,14 @@ namespace Content.Client.Actions
public override void AddAction(EntityUid uid, ActionType action, EntityUid? provider, ActionsComponent? comp = null, bool dirty = true)
{
if (uid != _playerManager.LocalPlayer?.ControlledEntity)
return;
if (!Resolve(uid, ref comp, false))
return;
base.AddAction(uid, action, provider, comp, dirty);
UIDirty = true;
if (uid == _playerManager.LocalPlayer?.ControlledEntity)
UIDirty = true;
}
public override void RemoveActions(EntityUid uid, IEnumerable<ActionType> actions, ActionsComponent? comp = null, bool dirty = true)

4
Content.Client/Audio/BackgroundAudioSystem.cs
View File

@@ -99,10 +99,8 @@ namespace Content.Client.Audio
if(_playMan.LocalPlayer is null || _playMan.LocalPlayer.ControlledEntity != message.Entity ||
!_timing.IsFirstTimePredicted) return;
if (!TryComp<TransformComponent>(message.Entity, out var xform)) return;
// Check if we traversed to grid.
if (_mapManager.TryGetGrid(xform.GridUid, out var grid))
if (message.Transform.GridUid != null)
{
if (_currentCollection == _stationAmbience) return;
ChangeAmbience(_stationAmbience);