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

4
Content.Server/UserInterface/ActivatableUIComponent.cs
View File

@@ -1,4 +1,4 @@
using Robust.Server.Player;
using Robust.Shared.Player;
using Robust.Shared.Reflection;
using Robust.Shared.Serialization;
@@ -65,7 +65,7 @@ namespace Content.Server.UserInterface
/// NOTE: DO NOT DIRECTLY SET, USE ActivatableUISystem.SetCurrentSingleUser
/// </summary>
[ViewVariables]
public IPlayerSession? CurrentSingleUser;
public ICommonSession? CurrentSingleUser;
void ISerializationHooks.AfterDeserialization()
{

8
Content.Server/UserInterface/ActivatableUISystem.cs
View File

@@ -8,7 +8,7 @@ using Content.Shared.Interaction.Events;
using Content.Shared.UserInterface;
using Content.Shared.Verbs;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Player;
namespace Content.Server.UserInterface;
@@ -173,7 +173,7 @@ public sealed partial class ActivatableUISystem : EntitySystem
return true;
}
public void SetCurrentSingleUser(EntityUid uid, IPlayerSession? v, ActivatableUIComponent? aui = null)
public void SetCurrentSingleUser(EntityUid uid, ICommonSession? v, ActivatableUIComponent? aui = null)
{
if (!Resolve(uid, ref aui))
return;
@@ -231,9 +231,9 @@ public sealed class UserOpenActivatableUIAttemptEvent : CancellableEntityEventAr
public sealed class AfterActivatableUIOpenEvent : EntityEventArgs
{
public EntityUid User { get; }
public readonly IPlayerSession Session;
public readonly ICommonSession Session;
public AfterActivatableUIOpenEvent(EntityUid who, IPlayerSession session)
public AfterActivatableUIOpenEvent(EntityUid who, ICommonSession session)
{
User = who;
Session = session;

3
Content.Server/UserInterface/StatValuesCommand.cs
View File

@@ -8,7 +8,6 @@ using Content.Shared.Materials;
using Content.Shared.Research.Prototypes;
using Content.Shared.UserInterface;
using Content.Shared.Weapons.Melee;
using Robust.Server.Player;
using Robust.Shared.Console;
using Robust.Shared.Prototypes;
@@ -27,7 +26,7 @@ public sealed class StatValuesCommand : IConsoleCommand
public string Help => $"{Command} <cargosell / lathesell / melee>";
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
if (shell.Player is not IPlayerSession pSession)
if (shell.Player is not { } pSession)
{
shell.WriteError(Loc.GetString("stat-values-server"));
return;