Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Content update for NetEntities (#18935)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls
RobustXamlLoader.Load(this);
}
public void UpdateWarps(IEnumerable<GhostWarp> warps)
public void UpdateWarps(IEnumerable<GhostWarp> warps, IEntityManager entManager)
{
// Server COULD send these sorted but how about we just use the client to do it instead
_warps = warps
@@ -33,7 +33,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls
? Loc.GetString("ghost-target-window-current-button", ("name", w.DisplayName))
: w.DisplayName;
return (name, w.Entity);
return (name, entManager.GetEntity(w.Entity));
})
.ToList();
}

3
Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
View File

@@ -11,6 +11,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
[UsedImplicitly]
public sealed class MakeGhostRoleEui : BaseEui
{
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IClientConsoleHost _consoleHost = default!;
@@ -32,7 +33,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
return;
}
_window.SetEntity(uiState.EntityUid);
_window.SetEntity(_entManager.GetEntity(uiState.EntityUid));
}
public override void Opened()

4
Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs
View File

@@ -96,7 +96,7 @@ public sealed class GhostUIController : UIController, IOnSystemChanged<GhostSyst
if (Gui?.TargetWindow is not { } window)
return;
window.UpdateWarps(msg.Warps);
window.UpdateWarps(msg.Warps, EntityManager);
window.Populate();
}
@@ -107,7 +107,7 @@ public sealed class GhostUIController : UIController, IOnSystemChanged<GhostSyst
private void OnWarpClicked(EntityUid player)
{
var msg = new GhostWarpToTargetRequestEvent(player);
var msg = new GhostWarpToTargetRequestEvent(EntityManager.GetNetEntity(player));
_net.SendSystemNetworkMessage(msg);
}