juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions 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

15
Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
View File

@@ -8,6 +8,7 @@ using Content.Shared.Mobs.Systems;
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;
@@ -17,13 +18,14 @@ 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; }
@@ -123,7 +125,8 @@ public abstract class SharedCryostorageSystem : EntitySystem
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;