tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove Session from MindComponent (#34753)

Browse Source 
* yummy

* fix tests
This commit is contained in:
Milon
2025-04-19 00:23:01 +02:00
committed by GitHub
parent ba6d8f5376
commit 3fc9bcbbbe
25 changed files with 149 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
View File

@@ -25,13 +25,14 @@ public sealed class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponent>
{
[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()
@@ -95,9 +96,10 @@ public sealed class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponent>
{
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",