ChatManager murder (#7337)

2022-03-30 22:21:58 -07:00
parent a11e8b676c
commit 70f0fffed2
16 changed files with 587 additions and 512 deletions
--- a/Content.Server/Chat/Commands/LOOCCommand.cs
+++ b/Content.Server/Chat/Commands/LOOCCommand.cs
@@ -24,6 +24,9 @@ namespace Content.Server.Chat.Commands
                return;
            }

+            if (player.AttachedEntity is not { Valid: true } entity)
+                return;
+
            if (player.Status != SessionStatus.InGame)
                return;

@@ -34,7 +37,7 @@ namespace Content.Server.Chat.Commands
            if (string.IsNullOrEmpty(message))
                return;

-            IoCManager.Resolve<IChatManager>().SendLOOC(player, message);
+            EntitySystem.Get<ChatSystem>().TrySendInGameOOCMessage(entity, message, InGameOOCChatType.Looc, false, shell, player);
        }
    }
 }