Hide deadchat bubbles if the player's mob doesn't have a GhostComponent
Fixes #2964
This commit is contained in:
@@ -1,11 +1,13 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Content.Client.Administration;
|
using Content.Client.Administration;
|
||||||
|
using Content.Client.GameObjects.Components.Observer;
|
||||||
using Content.Client.Interfaces.Chat;
|
using Content.Client.Interfaces.Chat;
|
||||||
using Content.Shared.Administration;
|
using Content.Shared.Administration;
|
||||||
using Content.Shared.Chat;
|
using Content.Shared.Chat;
|
||||||
using Robust.Client.Console;
|
using Robust.Client.Console;
|
||||||
using Robust.Client.Interfaces.Graphics.ClientEye;
|
using Robust.Client.Interfaces.Graphics.ClientEye;
|
||||||
using Robust.Client.Interfaces.UserInterface;
|
using Robust.Client.Interfaces.UserInterface;
|
||||||
|
using Robust.Client.Player;
|
||||||
using Robust.Client.UserInterface;
|
using Robust.Client.UserInterface;
|
||||||
using Robust.Client.UserInterface.Controls;
|
using Robust.Client.UserInterface.Controls;
|
||||||
using Robust.Shared.GameObjects;
|
using Robust.Shared.GameObjects;
|
||||||
@@ -25,6 +27,8 @@ namespace Content.Client.Chat
|
|||||||
{
|
{
|
||||||
internal sealed class ChatManager : IChatManager, IPostInjectInit
|
internal sealed class ChatManager : IChatManager, IPostInjectInit
|
||||||
{
|
{
|
||||||
|
[Dependency] private IPlayerManager _playerManager = default!;
|
||||||
|
|
||||||
private struct SpeechBubbleData
|
private struct SpeechBubbleData
|
||||||
{
|
{
|
||||||
public string Message;
|
public string Message;
|
||||||
@@ -387,7 +391,13 @@ namespace Content.Client.Chat
|
|||||||
switch (msg.Channel)
|
switch (msg.Channel)
|
||||||
{
|
{
|
||||||
case ChatChannel.Local:
|
case ChatChannel.Local:
|
||||||
|
AddSpeechBubble(msg, SpeechBubble.SpeechType.Say);
|
||||||
|
break;
|
||||||
|
|
||||||
case ChatChannel.Dead:
|
case ChatChannel.Dead:
|
||||||
|
if (!_playerManager.LocalPlayer?.ControlledEntity?.HasComponent<GhostComponent>() ?? true)
|
||||||
|
break;
|
||||||
|
|
||||||
AddSpeechBubble(msg, SpeechBubble.SpeechType.Say);
|
AddSpeechBubble(msg, SpeechBubble.SpeechType.Say);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user