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

Fix some TryGetMind overrides relying on player data (#26992)

Browse Source 
* Fix some TryGetMind overrides relying on player data

* A

* Rider has bamboozled me

* Update `data.Mind` before attaching to entity.
This commit is contained in:
Leon Friedrich
2024-04-16 16:26:32 +12:00
committed by GitHub
parent faba129e78
commit 229caa10bf
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Mind/MindSystem.cs
View File

@@ -357,16 +357,17 @@ public sealed class MindSystem : SharedMindSystem
mind.UserId = userId; mind.UserId = userId;
mind.OriginalOwnerUserId ??= userId; mind.OriginalOwnerUserId ??= userId;
// The UserId may not have a current session, but user data may still exist for disconnected players.
// So we cannot combine this with the TryGetSessionById() check below.
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 ret))
{ {
mind.Session = ret; mind.Session = ret;
_pvsOverride.AddSessionOverride(netMind, ret); _pvsOverride.AddSessionOverride(netMind, ret);
_players.SetAttachedEntity(ret, mind.CurrentEntity); _players.SetAttachedEntity(ret, mind.CurrentEntity);
} }
// session may be null, but user data may still exist for disconnected players.
if (_players.GetPlayerData(userId.Value).ContentData() is { } data)
data.Mind = mindId;
} }
public void ControlMob(EntityUid user, EntityUid target) public void ControlMob(EntityUid user, EntityUid target)

27
Content.Shared/Mind/SharedMindSystem.cs
View File

@@ -26,6 +26,7 @@ public abstract class SharedMindSystem : EntitySystem
[Dependency] private readonly SharedObjectivesSystem _objectives = default!; [Dependency] private readonly SharedObjectivesSystem _objectives = default!;
[Dependency] private readonly SharedPlayerSystem _player = default!; [Dependency] private readonly SharedPlayerSystem _player = default!;
[Dependency] private readonly MetaDataSystem _metadata = default!; [Dependency] private readonly MetaDataSystem _metadata = default!;
[Dependency] private readonly ISharedPlayerManager _playerMan = default!;
[ViewVariables] [ViewVariables]
protected readonly Dictionary<NetUserId, EntityUid> UserMinds = new(); protected readonly Dictionary<NetUserId, EntityUid> UserMinds = new();
@@ -107,6 +108,7 @@ public abstract class SharedMindSystem : EntitySystem
TryComp(mindIdValue, out mind)) TryComp(mindIdValue, out mind))
{ {
DebugTools.Assert(mind.UserId == user); DebugTools.Assert(mind.UserId == user);
mindId = mindIdValue; mindId = mindIdValue;
return true; return true;
} }
@@ -422,29 +424,26 @@ public abstract class SharedMindSystem : EntitySystem
return TryComp(mindId, out mind); return TryComp(mindId, out mind);
} }
public bool TryGetMind( // TODO MIND make this return a nullable EntityUid or Entity<MindComponent>
ContentPlayerData contentPlayer,
out EntityUid mindId,
[NotNullWhen(true)] out MindComponent? mind)
{
mindId = contentPlayer.Mind ?? default;
return TryComp(mindId, out mind);
}
public bool TryGetMind( public bool TryGetMind(
ICommonSession? player, ICommonSession? player,
out EntityUid mindId, out EntityUid mindId,
[NotNullWhen(true)] out MindComponent? mind) [NotNullWhen(true)] out MindComponent? mind)
{ {
mindId = default; if (player == null)
mind = null; {
if (_player.ContentData(player) is not { } data) mindId = default;
mind = null;
return false; return false;
}
if (TryGetMind(data, out mindId, out mind)) if (TryGetMind(player.UserId, out var mindUid, out mind))
{
mindId = mindUid.Value;
return true; return true;
}
DebugTools.AssertNull(data.Mind); mindId = default;
return false; return false;
} }