ActorComponent actor = default!;
Assert.Multiple(() =>
{
- Assert.That(player, Is.EqualTo(mind.Session), "Player session does not match mind session");
+ Assert.That(player.UserId, Is.EqualTo(mind.UserId), "Player UserId does not match mind UserId");
Assert.That(entMan.System<MindSystem>().GetMind(player.UserId), Is.EqualTo(mindId));
Assert.That(player.AttachedEntity, Is.EqualTo(mind.CurrentEntity), "Player is not attached to the mind's current entity.");
Assert.That(entMan.EntityExists(mind.OwnedEntity), "The mind's current entity does not exist");
Assert.That(mind.VisitingEntity == null || entMan.EntityExists(mind.VisitingEntity), "The minds visited entity does not exist.");
Assert.That(entMan.TryGetComponent(mind.CurrentEntity, out actor));
});
- Assert.That(actor.PlayerSession, Is.EqualTo(mind.Session));
+ Assert.That(actor.PlayerSession.UserId, Is.EqualTo(mind.UserId));
return (mindId, mind);
}
{
Assert.That(player.Status, Is.EqualTo(SessionStatus.Disconnected));
Assert.That(mind.UserId, Is.Not.Null);
- Assert.That(mind.Session, Is.Null);
});
}
Assert.Multiple(() =>
{
Assert.That(entMan.Deleted(entity));
- Assert.That(mind.Comp.OwnedEntity, Is.Null);
+ Assert.That(mind.Comp.OwnedEntity, Is.Not.EqualTo(entity));
});
// Reconnect
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Console;
+using Robust.Shared.Player;
namespace Content.Server.Administration.Commands;
public sealed class AGhostCommand : LocalizedCommands
{
[Dependency] private readonly IEntityManager _entities = default!;
- [Dependency] private readonly IPlayerManager _playerManager = default!;
+ [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
public override string Command => "aghost";
public override string Help => "aghost";
// TODO: Remove duplication between all this and "GamePreset.OnGhostAttempt()"...
if (!string.IsNullOrWhiteSpace(mind.CharacterName))
metaDataSystem.SetEntityName(ghost, mind.CharacterName);
- else if (!string.IsNullOrWhiteSpace(mind.Session?.Name))
- metaDataSystem.SetEntityName(ghost, mind.Session.Name);
+ else if (!string.IsNullOrWhiteSpace(player.Name))
+ metaDataSystem.SetEntityName(ghost, player.Name);
mindSystem.Visit(mindId, ghost, mind);
}
private void OnRoleEvent(RoleEvent ev)
{
- var session = _minds.GetSession(ev.Mind);
-
- if (!ev.RoleTypeUpdate || session == null)
+ if (!ev.RoleTypeUpdate || !_playerManager.TryGetSessionById(ev.Mind.UserId, out var session))
return;
UpdatePlayerList(session);
using Content.Shared.Whitelist;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Physics.Events;
+using Robust.Shared.Player;
using Robust.Shared.Prototypes;
namespace Content.Server.Anomaly.Effects;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly BodySystem _body = default!;
[Dependency] private readonly IChatManager _chat = default!;
+ [Dependency] private readonly ISharedPlayerManager _player = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
[Dependency] private readonly JitteringSystem _jitter = default!;
[Dependency] private readonly MindSystem _mind = default!;
if (ent.Comp.StartMessage is not null &&
_mind.TryGetMind(ent, out _, out var mindComponent) &&
- mindComponent.Session != null)
+ _player.TryGetSessionById(mindComponent.UserId, out var session))
{
var message = Loc.GetString(ent.Comp.StartMessage);
var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", message));
wrappedMessage,
default,
false,
- mindComponent.Session.Channel,
+ session.Channel,
_messageColor);
_popup.PopupEntity(message, ent, ent, PopupType.MediumCaution);
private void OnSeverityChanged(Entity<InnerBodyAnomalyComponent> ent, ref AnomalySeverityChangedEvent args)
{
- if (!_mind.TryGetMind(ent, out _, out var mindComponent) || mindComponent.Session == null)
+ if (!_mind.TryGetMind(ent, out _, out var mindComponent) ||
+ !_player.TryGetSessionById(mindComponent.UserId, out var session))
return;
var message = string.Empty;
wrappedMessage,
default,
false,
- mindComponent.Session.Channel,
+ session.Channel,
_messageColor);
_popup.PopupEntity(message, ent, ent, PopupType.MediumCaution);
if (ent.Comp.EndMessage is not null &&
_mind.TryGetMind(ent, out _, out var mindComponent) &&
- mindComponent.Session != null)
+ _player.TryGetSessionById(mindComponent.UserId, out var session))
{
var message = Loc.GetString(ent.Comp.EndMessage);
var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", message));
wrappedMessage,
default,
false,
- mindComponent.Session.Channel,
+ session.Channel,
_messageColor);
if (!_mind.TryGetMind(entity, out _, out var mindComponent))
return;
- if (mindComponent.Session == null)
+ if (!_playerManager.TryGetSessionById(mindComponent.UserId, out var session))
return;
- SendBriefing(mindComponent.Session, briefing, briefingColor, briefingSound);
+ SendBriefing(session, briefing, briefingColor, briefingSound);
}
/// <summary>
[Dependency] private readonly INetConfigurationManager _netConfigManager = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly PlayerRateLimitManager _rateLimitManager = default!;
+ [Dependency] private readonly ISharedPlayerManager _player = default!;
/// <summary>
/// The maximum length a player-sent message can be sent
var adminSystem = _entityManager.System<AdminSystem>();
var antag = mind.UserId != null && (adminSystem.GetCachedPlayerInfo(mind.UserId.Value)?.Antag ?? false);
- SendAdminAlert($"{mind.Session?.Name}{(antag ? " (ANTAG)" : "")} {message}");
+ // We shouldn't be repeating this but I don't want to touch any more chat code than necessary
+ var playerName = mind.UserId is { } userId && _player.TryGetSessionById(userId, out var session)
+ ? session.Name
+ : "Unknown";
+
+ SendAdminAlert($"{playerName}{(antag ? " (ANTAG)" : "")} {message}");
}
public void SendHookOOC(string sender, string message)
if (!_mindSystem.TryGetMind(body.Value, out var mindId, out var mind))
return;
- if (mind.UserId.HasValue == false || mind.Session == null)
+ if (mind.UserId.HasValue == false || !_playerManager.ValidSessionId(mind.UserId.Value))
return;
if (_cloningPodSystem.TryCloning(cloningPodUid, body.Value, (mindId, mind), cloningPod, scannerComp.CloningFailChanceMultiplier))
{
if (args.NewStatus != SessionStatus.Disconnected)
{
- mind.Session = session;
_pvsOverride.AddSessionOverride(mindId.Value, session);
}
-
- DebugTools.Assert(mind.Session == session);
}
DebugTools.Assert(session.GetMind() == mindId);
case SessionStatus.Disconnected:
{
_chatManager.SendAdminAnnouncement(Loc.GetString("player-leave-message", ("name", args.Session.Name)));
- if (mind != null)
+ if (mindId != null)
{
- _pvsOverride.ClearOverride(GetNetEntity(mindId!.Value));
- mind.Session = null;
+ _pvsOverride.RemoveSessionOverride(mindId.Value, session);
}
_userDb.ClientDisconnected(session);
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using Content.Shared.Cuffs.Components;
+using Robust.Shared.Player;
namespace Content.Server.GameTicking.Rules;
/// </summary>
public sealed class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleComponent>
{
- [Dependency] private readonly IAdminLogManager _adminLogManager = default!;
[Dependency] private readonly AntagSelectionSystem _antag = default!;
[Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!;
[Dependency] private readonly EuiManager _euiMan = default!;
+ [Dependency] private readonly IAdminLogManager _adminLogManager = default!;
+ [Dependency] private readonly IGameTiming _timing = default!;
+ [Dependency] private readonly ISharedPlayerManager _player = default!;
[Dependency] private readonly MindSystem _mind = default!;
[Dependency] private readonly MobStateSystem _mobState = default!;
[Dependency] private readonly NpcFactionSystem _npcFaction = default!;
[Dependency] private readonly PopupSystem _popup = default!;
[Dependency] private readonly RoleSystem _role = default!;
- [Dependency] private readonly SharedStunSystem _stun = default!;
[Dependency] private readonly RoundEndSystem _roundEnd = default!;
+ [Dependency] private readonly SharedStunSystem _stun = default!;
[Dependency] private readonly StationSystem _stationSystem = default!;
- [Dependency] private readonly IGameTiming _timing = default!;
//Used in OnPostFlash, no reference to the rule component is available
public readonly ProtoId<NpcFactionPrototype> RevolutionaryNpcFaction = "Revolutionary";
_role.MindAddRole(mindId, "MindRoleRevolutionary");
}
- if (mind?.Session != null)
- _antag.SendBriefing(mind.Session, Loc.GetString("rev-role-greeting"), Color.Red, revComp.RevStartSound);
+ if (mind is { UserId: not null } && _player.TryGetSessionById(mind.UserId, out var session))
+ _antag.SendBriefing(session, Loc.GetString("rev-role-greeting"), Color.Red, revComp.RevStartSound);
}
//TODO: Enemies of the revolution
_popup.PopupEntity(Loc.GetString("rev-break-control", ("name", Identity.Entity(uid, EntityManager))), uid);
_adminLogManager.Add(LogType.Mind, LogImpact.Medium, $"{ToPrettyString(uid)} was deconverted due to all Head Revolutionaries dying.");
- if (!_mind.TryGetMind(uid, out var mindId, out _, mc))
+ if (!_mind.TryGetMind(uid, out var mindId, out var mind, mc))
continue;
// remove their antag role
// make it very obvious to the rev they've been deconverted since
// they may not see the popup due to antag and/or new player tunnel vision
- if (_mind.TryGetSession(mindId, out var session))
+ if (_player.TryGetSessionById(mind.UserId, out var session))
_euiMan.OpenEui(new DeconvertedEui(), session);
}
return true;
{
[Dependency] private readonly AntagSelectionSystem _antag = default!;
[Dependency] private readonly ChatSystem _chat = default!;
- [Dependency] private readonly SharedMindSystem _mindSystem = default!;
+ [Dependency] private readonly IGameTiming _timing = default!;
+ [Dependency] private readonly ISharedPlayerManager _player = default!;
[Dependency] private readonly MobStateSystem _mobState = default!;
[Dependency] private readonly PopupSystem _popup = default!;
- [Dependency] private readonly SharedRoleSystem _roles = default!;
[Dependency] private readonly RoundEndSystem _roundEnd = default!;
+ [Dependency] private readonly SharedMindSystem _mindSystem = default!;
+ [Dependency] private readonly SharedRoleSystem _roles = default!;
[Dependency] private readonly StationSystem _station = default!;
- [Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly ZombieSystem _zombie = default!;
public override void Initialize()
{
var meta = MetaData(survivor);
var username = string.Empty;
- if (_mindSystem.TryGetMind(survivor, out _, out var mind) && mind.Session != null)
+ if (_mindSystem.TryGetMind(survivor, out _, out var mind) &&
+ _player.TryGetSessionById(mind.UserId, out var session))
{
- username = mind.Session.Name;
+ username = session.Name;
}
args.AddLine(Loc.GetString("zombie-round-end-user-was-survivor",
[Dependency] private readonly MindSystem _minds = default!;
[Dependency] private readonly MobStateSystem _mobState = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
- [Dependency] private readonly IPlayerManager _playerManager = default!;
+ [Dependency] private readonly ISharedPlayerManager _player = default!;
[Dependency] private readonly TransformSystem _transformSystem = default!;
[Dependency] private readonly VisibilitySystem _visibilitySystem = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
private IEnumerable<GhostWarp> GetPlayerWarps(EntityUid except)
{
- foreach (var player in _playerManager.Sessions)
+ foreach (var player in _player.Sessions)
{
if (player.AttachedEntity is not {Valid: true} attached)
continue;
// However, that should rarely happen.
if (!string.IsNullOrWhiteSpace(mind.Comp.CharacterName))
_metaData.SetEntityName(ghost, mind.Comp.CharacterName);
- else if (!string.IsNullOrWhiteSpace(mind.Comp.Session?.Name))
- _metaData.SetEntityName(ghost, mind.Comp.Session.Name);
+ else if (mind.Comp.UserId is { } userId && _player.TryGetSessionById(userId, out var session))
+ _metaData.SetEntityName(ghost, session.Name);
if (mind.Comp.TimeOfDeath.HasValue)
{
if (mind.PreventGhosting && !forced)
{
- if (mind.Session != null) // Logging is suppressed to prevent spam from ghost attempts caused by movement attempts
+ if (_player.TryGetSessionById(mind.UserId, out var session)) // Logging is suppressed to prevent spam from ghost attempts caused by movement attempts
{
- _chatManager.DispatchServerMessage(mind.Session, Loc.GetString("comp-mind-ghosting-prevented"),
+ _chatManager.DispatchServerMessage(session, Loc.GetString("comp-mind-ghosting-prevented"),
true);
}
using Content.Shared.Eui;
using Content.Shared.Ghost;
using Content.Shared.Mind;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
namespace Content.Server.Ghost;
public sealed class ReturnToBodyEui : BaseEui
{
private readonly SharedMindSystem _mindSystem;
+ private readonly ISharedPlayerManager _player;
+ private readonly NetUserId? _userId;
- private readonly MindComponent _mind;
-
- public ReturnToBodyEui(MindComponent mind, SharedMindSystem mindSystem)
+ public ReturnToBodyEui(MindComponent mind, SharedMindSystem mindSystem, ISharedPlayerManager player)
{
- _mind = mind;
_mindSystem = mindSystem;
+ _player = player;
+ _userId = mind.UserId;
}
public override void HandleMessage(EuiMessageBase msg)
return;
}
- _mindSystem.UnVisit(_mind.Session);
+ if (_userId is { } userId && _player.TryGetSessionById(userId, out var session))
+ _mindSystem.UnVisit(session);
Close();
}
[Dependency] private readonly DoAfterSystem _doAfter = default!;
[Dependency] private readonly ElectrocutionSystem _electrocution = default!;
[Dependency] private readonly EuiManager _euiManager = default!;
+ [Dependency] private readonly ISharedPlayerManager _player = default!;
[Dependency] private readonly ItemToggleSystem _toggle = default!;
- [Dependency] private readonly RottingSystem _rotting = default!;
[Dependency] private readonly MobStateSystem _mobState = default!;
[Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
[Dependency] private readonly PopupSystem _popup = default!;
[Dependency] private readonly PowerCellSystem _powerCell = default!;
+ [Dependency] private readonly RottingSystem _rotting = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedMindSystem _mind = default!;
[Dependency] private readonly UseDelaySystem _useDelay = default!;
}
if (_mind.TryGetMind(target, out _, out var mind) &&
- mind.Session is { } playerSession)
+ _player.TryGetSessionById(mind.UserId, out var playerSession))
{
session = playerSession;
// notify them they're being revived.
if (mind.CurrentEntity != target)
{
- _euiManager.OpenEui(new ReturnToBodyEui(mind, _mind), session);
+ _euiManager.OpenEui(new ReturnToBodyEui(mind, _mind, _player), session);
}
}
else
TransferTo(mindId, null, createGhost: false, mind: mind);
DebugTools.AssertNull(mind.OwnedEntity);
- if (!component.GhostOnShutdown || mind.Session == null || _gameTicker.RunLevel == GameRunLevel.PreRoundLobby)
+ if (!component.GhostOnShutdown || _gameTicker.RunLevel == GameRunLevel.PreRoundLobby)
return;
var ghost = _ghosts.SpawnGhost((mindId, mind), uid);
return false;
}
- public ICommonSession? GetSession(MindComponent mind)
- {
- return mind.Session;
- }
-
- public bool TryGetSession(MindComponent mind, [NotNullWhen(true)] out ICommonSession? session)
- {
- return (session = GetSession(mind)) != null;
- }
-
public override void WipeAllMinds()
{
base.WipeAllMinds();
// Do this AFTER the entity changes above as this will fire off a player-detached event
// which will run ghosting twice.
- if (GetSession(mind) is { } session)
+ if (_players.TryGetSessionById(mind.UserId, out var session))
_players.SetAttachedEntity(session, entity);
- Log.Info($"Session {mind.Session?.Name} visiting entity {entity}.");
+ Log.Info($"Session {session?.Name} visiting entity {entity}.");
}
public override void UnVisit(EntityUid mindId, MindComponent? mind = null)
RemoveVisitingEntity(mindId, mind);
- if (mind.Session == null || mind.Session.AttachedEntity == mind.VisitingEntity)
+ if (mind.UserId == null || !_players.TryGetSessionById(mind.UserId.Value, out var session))
+ return;
+
+ if (session.AttachedEntity == mind.VisitingEntity)
return;
var owned = mind.OwnedEntity;
- if (GetSession(mind) is { } session)
- _players.SetAttachedEntity(session, owned);
+ _players.SetAttachedEntity(session, owned);
if (owned.HasValue)
{
_adminLogger.Add(LogType.Mind, LogImpact.Low,
- $"{mind.Session.Name} returned to {ToPrettyString(owned.Value)}");
+ $"{session.Name} returned to {ToPrettyString(owned.Value)}");
}
}
if (TryComp<ActorComponent>(entity.Value, out var actor))
{
// Happens when transferring to your currently visited entity.
- if (actor.PlayerSession != mind.Session)
+ if (!_players.TryGetSessionByEntity(entity.Value, out var session) ||
+ mind.UserId == null || actor.PlayerSession != session )
{
throw new ArgumentException("Visit target already has a session.", nameof(entity));
}
}
// Player is CURRENTLY connected.
- var session = GetSession(mind);
- if (session != null && !alreadyAttached && mind.VisitingEntity == null)
+ if (mind.UserId != null && _players.TryGetSessionById(mind.UserId.Value, out var userSession)
+ && !alreadyAttached && mind.VisitingEntity == null)
{
- _players.SetAttachedEntity(session, entity, true);
- DebugTools.Assert(session.AttachedEntity == entity, $"Failed to attach entity.");
- Log.Info($"Session {session.Name} transferred to entity {entity}.");
+ _players.SetAttachedEntity(userSession, entity, true);
+ DebugTools.Assert(userSession.AttachedEntity == entity, "Failed to attach entity.");
+ Log.Info($"Session {userSession.Name} transferred to entity {entity}.");
}
if (entity != null)
return;
Dirty(mindId, mind);
- var netMind = GetNetEntity(mindId);
- _pvsOverride.ClearOverride(netMind);
+
if (userId != null && !_players.TryGetPlayerData(userId.Value, out _))
{
Log.Error($"Attempted to set mind user to invalid value {userId}");
return;
}
- if (mind.Session != null)
+ // Clear any existing entity attachment
+ if (_players.TryGetSessionById(mind.UserId, out var oldSession))
{
- _players.SetAttachedEntity(GetSession(mind), null);
- mind.Session = null;
+ _players.SetAttachedEntity(oldSession, null);
+ _pvsOverride.RemoveSessionOverride(mindId, oldSession);
}
if (mind.UserId != null)
}
if (userId == null)
- {
- DebugTools.AssertNull(mind.Session);
return;
- }
if (UserMinds.TryGetValue(userId.Value, out var oldMindId) &&
TryComp(oldMindId, out MindComponent? oldMind))
if (_players.GetPlayerData(userId.Value).ContentData() is { } data)
data.Mind = mindId;
- if (_players.TryGetSessionById(userId.Value, out var ret))
+ if (_players.TryGetSessionById(userId.Value, out var session))
{
- mind.Session = ret;
- _pvsOverride.AddSessionOverride(mindId, ret);
- _players.SetAttachedEntity(ret, mind.CurrentEntity);
+ _pvsOverride.AddSessionOverride(mindId, session);
+ _players.SetAttachedEntity(session, mind.CurrentEntity);
}
}
private void OnRoleEvent(RoleEvent ev)
{
- if (_minds.TryGetSession(ev.Mind, out var session))
+ if (_playerManager.TryGetSessionById(ev.Mind.UserId, out var session))
_tracking.QueueRefreshTrackers(session);
}
using Content.Shared.Mind;
using Content.Shared.Roles;
using Content.Shared.Roles.Jobs;
+using Robust.Shared.Player;
namespace Content.Server.Roles.Jobs;
{
[Dependency] private readonly IChatManager _chat = default!;
[Dependency] private readonly MindSystem _mind = default!;
+ [Dependency] private readonly ISharedPlayerManager _player = default!;
[Dependency] private readonly RoleSystem _roles = default!;
public override void Initialize()
if (args.Silent)
return;
- if (!_mind.TryGetSession(mindId, out var session))
+ if (!_player.TryGetSessionById(component.UserId, out var session))
return;
if (!MindTryGetJob(mindId, out var prototype))
public void RoleUpdateMessage(MindComponent mind)
{
- if (mind.Session is null)
+ if (!Player.TryGetSessionById(mind.UserId, out var session))
return;
if (!_proto.TryIndex(mind.RoleType, out var proto))
var roleText = Loc.GetString(proto.Name);
var color = proto.Color;
- var session = mind.Session;
-
//TODO add audio? Would need to be optional so it does not play on role changes that already come with their own audio
// _audio.PlayGlobal(Sound, session);
[Dependency] private readonly UserInterfaceSystem _ui = default!;
[Dependency] private readonly SharedContainerSystem _container = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
-
+ [Dependency] private readonly ISharedPlayerManager _player = default!;
[ValidatePrototypeId<JobPrototype>]
public const string BorgJobId = "Borg";
if (component.BrainEntity == null && brain != null &&
_whitelistSystem.IsWhitelistPassOrNull(component.BrainWhitelist, used))
{
- if (_mind.TryGetMind(used, out _, out var mind) && mind.Session != null)
+ if (_mind.TryGetMind(used, out _, out var mind) &&
+ _player.TryGetSessionById(mind.UserId, out var session))
{
- if (!CanPlayerBeBorged(mind.Session))
+ if (!CanPlayerBeBorged(session))
{
Popup.PopupEntity(Loc.GetString("borg-player-not-allowed"), used, args.User);
return;
container.ID != chassisComponent.BrainContainerId)
return;
- if (!_mind.TryGetMind(uid, out var mindId, out var mind) || mind.Session == null)
+ if (!_mind.TryGetMind(uid, out var mindId, out var mind) ||
+ !_player.TryGetSessionById(mind.UserId, out var session))
return;
- if (!CanPlayerBeBorged(mind.Session))
+ if (!CanPlayerBeBorged(session))
{
Popup.PopupEntity(Loc.GetString("borg-player-not-allowed-eject"), uid);
Container.RemoveEntity(containerEnt, uid);
using Content.Server.Antag;
using Content.Server.Traitor.Components;
using Content.Shared.Mind.Components;
+using Robust.Shared.Player;
using Robust.Shared.Prototypes;
namespace Content.Server.Traitor.Systems;
public sealed class AutoTraitorSystem : EntitySystem
{
[Dependency] private readonly AntagSelectionSystem _antag = default!;
+ [Dependency] private readonly ISharedPlayerManager _player = default!;
public override void Initialize()
{
private void OnMindAdded(EntityUid uid, AutoTraitorComponent comp, MindAddedMessage args)
{
- _antag.ForceMakeAntag<AutoTraitorComponent>(args.Mind.Comp.Session, comp.Profile);
+ if (!_player.TryGetSessionById(args.Mind.Comp.UserId, out var session))
+ return;
+
+ _antag.ForceMakeAntag<AutoTraitorComponent>(session, comp.Profile);
}
}
using Content.Shared.Traits.Assorted;
using Robust.Shared.Audio.Systems;
using Content.Shared.Ghost.Roles.Components;
+using Content.Shared.Roles;
using Content.Shared.Tag;
+using Robust.Shared.Player;
using Robust.Shared.Prototypes;
namespace Content.Server.Zombies;
[Dependency] private readonly NPCSystem _npc = default!;
[Dependency] private readonly TagSystem _tag = default!;
[Dependency] private readonly NameModifierSystem _nameMod = default!;
+ [Dependency] private readonly SharedRoleSystem _roles = default!;
+ [Dependency] private readonly ISharedPlayerManager _player = default!;
private static readonly ProtoId<TagPrototype> InvalidForGlobalSpawnSpellTag = "InvalidForGlobalSpawnSpell";
private static readonly ProtoId<TagPrototype> CannotSuicideTag = "CannotSuicide";
_npc.SleepNPC(target, htn);
//He's gotta have a mind
- var hasMind = _mind.TryGetMind(target, out var mindId, out _);
- if (hasMind && _mind.TryGetSession(mindId, out var session))
+ var hasMind = _mind.TryGetMind(target, out var mindId, out var mind);
+ if (hasMind && mind != null && _player.TryGetSessionById(mind.UserId, out var session))
{
//Zombie role for player manifest
_role.MindAddRole(mindId, "MindRoleZombie", mind: null, silent: true);
using Robust.Shared.Configuration;
using Robust.Shared.Containers;
using Robust.Shared.Map;
+using Robust.Shared.Player;
using Robust.Shared.Timing;
namespace Content.Shared.Bed.Cryostorage;
/// </summary>
public abstract class SharedCryostorageSystem : EntitySystem
{
- [Dependency] protected readonly ISharedAdminLogManager AdminLog = default!;
- [Dependency] private readonly IConfigurationManager _configuration = default!;
+ [Dependency] private readonly IConfigurationManager _configuration = default!;
+ [Dependency] private readonly IMapManager _mapManager = default!;
+ [Dependency] private readonly ISharedPlayerManager _player = default!;
+ [Dependency] private readonly MobStateSystem _mobState = default!;
+ [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] protected readonly IGameTiming Timing = default!;
- [Dependency] private readonly IMapManager _mapManager = default!;
- [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+ [Dependency] protected readonly ISharedAdminLogManager AdminLog = default!;
[Dependency] protected readonly SharedMindSystem Mind = default!;
- [Dependency] private readonly MobStateSystem _mobState = default!;
protected EntityUid? PausedMap { get; private set; }
if (args.Dragged == args.User)
return;
- if (!Mind.TryGetMind(args.Dragged, out _, out var mindComp) || mindComp.Session?.AttachedEntity != args.Dragged)
+ if (!_player.TryGetSessionByEntity(args.Dragged, out var session) ||
+ session.AttachedEntity != args.Dragged)
return;
args.CanDrop = false;
/// </summary>
[DataField]
public LocId? Subtype;
-
- /// <summary>
- /// The session of the player owning this mind.
- /// Can be null, in which case the player is currently not logged in.
- /// </summary>
- [ViewVariables, Access(typeof(SharedMindSystem), typeof(SharedGameTicker))]
- // TODO remove this after moving IPlayerManager functions to shared
- public ICommonSession? Session { get; set; }
}
[Dependency] private readonly MobStateSystem _mobState = default!;
[Dependency] private readonly SharedObjectivesSystem _objectives = default!;
[Dependency] private readonly SharedPlayerSystem _player = default!;
+ [Dependency] private readonly ISharedPlayerManager _playerManager = default!;
[Dependency] private readonly MetaDataSystem _metadata = default!;
[Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
if (!mindContainer.ShowExamineInfo || !args.IsInDetailsRange)
return;
- // TODO predict we can't right now because session stuff isnt networked
+ // TODO: Move this out of the SharedMindSystem into its own comp and predict it
if (_net.IsClient)
return;
var dead = _mobState.IsDead(uid);
- var hasUserId = CompOrNull<MindComponent>(mindContainer.Mind)?.UserId;
- var hasSession = CompOrNull<MindComponent>(mindContainer.Mind)?.Session;
+ var mind = CompOrNull<MindComponent>(mindContainer.Mind);
+ var hasUserId = mind?.UserId;
+ var hasActiveSession = hasUserId != null && _playerManager.ValidSessionId(hasUserId.Value);
+
+ // Scenarios:
+ // 1. Dead + No User ID: Entity is permanently dead with no player ever attached
+ // 2. Dead + Has User ID + No Session: Player died and disconnected
+ // 3. Dead + Has Session: Player is dead but still connected
+ // 4. Alive + No User ID: Entity was never controlled by a player
+ // 5. Alive + No Session: Player disconnected while alive (SSD)
if (dead && hasUserId == null)
args.PushMarkup($"[color=mediumpurple]{Loc.GetString("comp-mind-examined-dead-and-irrecoverable", ("ent", uid))}[/color]");
- else if (dead && hasSession == null)
+ else if (dead && !hasActiveSession)
args.PushMarkup($"[color=yellow]{Loc.GetString("comp-mind-examined-dead-and-ssd", ("ent", uid))}[/color]");
else if (dead)
args.PushMarkup($"[color=red]{Loc.GetString("comp-mind-examined-dead", ("ent", uid))}[/color]");
else if (hasUserId == null)
args.PushMarkup($"[color=mediumpurple]{Loc.GetString("comp-mind-examined-catatonic", ("ent", uid))}[/color]");
- else if (hasSession == null)
+ else if (!hasActiveSession)
args.PushMarkup($"[color=yellow]{Loc.GetString("comp-mind-examined-ssd", ("ent", uid))}[/color]");
}
return false;
}
- public bool TryGetSession(EntityUid? mindId, [NotNullWhen(true)] out ICommonSession? session)
- {
- session = null;
- return TryComp(mindId, out MindComponent? mind) && (session = mind.Session) != null;
- }
-
/// <summary>
/// Gets a mind from uid and/or MindContainerComponent. Used for null checks.
/// </summary>
using Robust.Shared.Audio.Systems;
using Robust.Shared.Configuration;
using Robust.Shared.Map;
+using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;
public abstract class SharedRoleSystem : EntitySystem
{
- [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
- [Dependency] private readonly SharedAudioSystem _audio = default!;
- [Dependency] private readonly IConfigurationManager _cfg = default!;
- [Dependency] private readonly IEntityManager _entityManager = default!;
- [Dependency] private readonly SharedMindSystem _minds = default!;
- [Dependency] private readonly IPrototypeManager _prototypes = default!;
+ [Dependency] private readonly IConfigurationManager _cfg = default!;
+ [Dependency] private readonly IEntityManager _entityManager = default!;
+ [Dependency] private readonly IPrototypeManager _prototypes = default!;
+ [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+ [Dependency] protected readonly ISharedPlayerManager Player = default!;
+ [Dependency] private readonly SharedAudioSystem _audio = default!;
+ [Dependency] private readonly SharedMindSystem _minds = default!;
private JobRequirementOverridePrototype? _requirementOverride;
Dirty(mind, comp);
// Update player character window
- if (_minds.TryGetSession(mind, out var session))
+ if (Player.TryGetSessionById(comp.UserId, out var session))
RaiseNetworkEvent(new MindRoleTypeChangedEvent(), session.Channel);
else
{
/// </summary>
public void MindPlaySound(EntityUid mindId, SoundSpecifier? sound, MindComponent? mind = null)
{
- if (Resolve(mindId, ref mind) && mind.Session != null)
- _audio.PlayGlobal(sound, mind.Session);
+ if (!Resolve(mindId, ref mind))
+ return;
+
+ if (Player.TryGetSessionById(mind.UserId, out var session))
+ _audio.PlayGlobal(sound, session);
}
// TODO ROLES Change to readonly.
projects / space-station-14.git / commitdiff