Fix ghosting in lobby (SerbiaStrong-220#513)

MIXnikita · Nov 15, 2023 · 4d3e151 · 4d3e151
1 parent 7095227
commit 4d3e151
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/Content.Server/Administration/Commands/AGhost.cs b/Content.Server/Administration/Commands/AGhost.cs
@@ -1,6 +1,7 @@
-using Content.Server.GameTicking;
+using Content.Server.GameTicking;
 using Content.Server.Hands.Systems;
 using Content.Shared.Administration;
+using Content.Shared.GameTicking;
 using Content.Shared.Ghost;
 using Content.Shared.Hands.Components;
 using Content.Shared.Mind;
@@ -35,6 +36,15 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                 return;
             }
 
+            //SS220-lobby-ghost-bug begin
+            var gameTicker = _entities.System<GameTicker>();
+            if (!gameTicker.PlayerGameStatuses.TryGetValue(player.UserId, out var status) || status is not PlayerGameStatus.JoinedGame)
+            {
+                shell.WriteLine("You can't ghost right now. You're not in game!");
+                return;
+            }
+            //SS220-lobby-ghost-bug end
+
             var metaDataSystem = _entities.System<MetaDataSystem>();
 
             if (mind.VisitingEntity != default && _entities.TryGetComponent<GhostComponent>(mind.VisitingEntity, out var oldGhostComponent))

diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/GameTicker.GamePreset.cs
@@ -7,6 +7,7 @@
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Database;
+using Content.Shared.GameTicking;
 using Content.Shared.Ghost;
 using Content.Shared.Mind;
 using Content.Shared.Mobs.Components;
@@ -198,6 +199,15 @@ public bool OnGhostAttempt(EntityUid mindId, bool canReturnGlobal, bool viaComma
             if (!Resolve(mindId, ref mind))
                 return false;
 
+            //SS220-lobby-ghost-bug begin
+            var player = mind.Session;
+            if (player is null)
+                return false;
+
+            if (!PlayerGameStatuses.TryGetValue(player.UserId, out var status) || status is not PlayerGameStatus.JoinedGame)
+                return false;
+            //SS220-lobby-ghost-bug end
+
             var playerEntity = mind.CurrentEntity;
 
             if (playerEntity != null && viaCommand)