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

Fix ghost actions disappearing when toggling visibility of other ghosts (#21033)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-20 00:05:33 -07:00
committed by GitHub
parent 5ae3a02ed5
commit 5734f02de5
2 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Client/Ghost/GhostSystem.cs
View File

@@ -1,7 +1,6 @@
using Content.Client.Movement.Systems; using Content.Client.Movement.Systems;
using Content.Shared.Actions; using Content.Shared.Actions;
using Content.Shared.Ghost; using Content.Shared.Ghost;
using Content.Shared.Popups;
using Robust.Client.Console; using Robust.Client.Console;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.Graphics; using Robust.Client.Graphics;
@@ -33,9 +32,10 @@ namespace Content.Client.Ghost
_ghostVisibility = value; _ghostVisibility = value;
foreach (var ghost in EntityQuery<GhostComponent, SpriteComponent>(true)) var query = AllEntityQuery<GhostComponent, SpriteComponent>();
while (query.MoveNext(out var uid, out _, out var sprite))
{ {
ghost.Item2.Visible = true; sprite.Visible = value || uid == _playerManager.LocalPlayer?.ControlledEntity;
} }
} }
} }
@@ -103,7 +103,10 @@ namespace Content.Client.Ghost
return; return;
Popup.PopupEntity(Loc.GetString("ghost-gui-toggle-ghost-visibility-popup"), args.Performer); Popup.PopupEntity(Loc.GetString("ghost-gui-toggle-ghost-visibility-popup"), args.Performer);
if (uid == _playerManager.LocalPlayer?.ControlledEntity)
ToggleGhostVisibility(); ToggleGhostVisibility();
args.Handled = true; args.Handled = true;
} }
@@ -204,7 +207,7 @@ namespace Content.Client.Ghost
public void ToggleGhostVisibility() public void ToggleGhostVisibility()
{ {
_console.RemoteExecuteCommand(null, "toggleghosts"); GhostVisibility = !GhostVisibility;
} }
} }
} }

27
Content.Server/Ghost/GhostSystem.cs
View File

@@ -6,7 +6,6 @@ using Content.Server.Mind;
using Content.Server.Roles.Jobs; using Content.Server.Roles.Jobs;
using Content.Server.Warps; using Content.Server.Warps;
using Content.Shared.Actions; using Content.Shared.Actions;
using Content.Shared.Administration;
using Content.Shared.Examine; using Content.Shared.Examine;
using Content.Shared.Eye; using Content.Shared.Eye;
using Content.Shared.Follower; using Content.Shared.Follower;
@@ -16,11 +15,9 @@ using Content.Shared.Mind.Components;
using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems; using Content.Shared.Mobs.Systems;
using Content.Shared.Movement.Events; using Content.Shared.Movement.Events;
using Content.Shared.Popups;
using Content.Shared.Storage.Components; using Content.Shared.Storage.Components;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Server.Player; using Robust.Server.Player;
using Robust.Shared.Console;
using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Systems; using Robust.Shared.Physics.Systems;
using Robust.Shared.Timing; using Robust.Shared.Timing;
@@ -357,28 +354,4 @@ namespace Content.Server.Ghost
return ghostBoo.Handled; return ghostBoo.Handled;
} }
} }
[AnyCommand]
public sealed class ToggleGhostVisibility : IConsoleCommand
{
public string Command => "toggleghosts";
public string Description => "Toggles ghost visibility";
public string Help => $"{Command}";
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
if (shell.Player == null)
shell.WriteLine("You can only toggle ghost visibility on a client.");
var entityManager = IoCManager.Resolve<IEntityManager>();
var uid = shell.Player?.AttachedEntity;
if (uid == null
|| !entityManager.HasComponent<GhostComponent>(uid)
|| !entityManager.TryGetComponent<EyeComponent>(uid, out var eyeComponent))
return;
entityManager.System<EyeSystem>().SetVisibilityMask(uid.Value, eyeComponent.VisibilityMask ^ (int) VisibilityFlags.Ghost, eyeComponent);
}
}
} }