juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Un-revert IPlayerManager refactor (#21244)

Browse Source
This commit is contained in:
Leon Friedrich
2023-10-28 09:59:53 +11:00
committed by GitHub
parent c55e1dcafd
commit e685cb626b
245 changed files with 781 additions and 943 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
View File

@@ -229,7 +229,7 @@ public sealed partial class BorgSystem
if (!TryComp<HandsComponent>(chassis, out var hands))
return;
if (LifeStage(uid) >= EntityLifeStage.Terminating)
if (TerminatingOrDeleted(uid))
{
foreach (var (hand, item) in component.ProvidedItems)
{

2
Content.Server/Silicons/Borgs/BorgSystem.cs
View File

@@ -21,7 +21,7 @@ using Content.Shared.Throwing;
using Content.Shared.Wires;
using Robust.Server.GameObjects;
using Robust.Shared.Containers;
using Robust.Shared.Players;
using Robust.Shared.Player;
using Robust.Shared.Random;
namespace Content.Server.Silicons.Borgs;

3
Content.Server/Silicons/Laws/SiliconLawSystem.cs
View File

@@ -18,7 +18,6 @@ using Content.Shared.Silicons.Laws.Components;
using Content.Shared.Stunnable;
using Content.Shared.Wires;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Prototypes;
using Robust.Shared.Toolshed;
@@ -96,7 +95,7 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem
HashSet<string>? radioChannels = intrinsicRadio?.Channels;
var state = new SiliconLawBuiState(GetLaws(uid).Laws, radioChannels);
_userInterface.TrySetUiState(args.Entity, SiliconLawsUiKey.Key, state, (IPlayerSession) args.Session);
_userInterface.TrySetUiState(args.Entity, SiliconLawsUiKey.Key, state, args.Session);
}
private void OnPlayerSpawnComplete(EntityUid uid, SiliconLawBoundComponent component, PlayerSpawnCompleteEvent args)