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

Revert "Mind ecs" (#14881)

Browse Source
This commit is contained in:
Leon Friedrich
2023-03-27 10:24:00 +13:00
committed by GitHub
parent c6c8fa2075
commit 4d71b1b81e
85 changed files with 684 additions and 1150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Chat/Managers/ChatManager.cs
View File

@@ -116,19 +116,19 @@ namespace Content.Server.Chat.Managers
ChatMessageToMany(ChatChannel.AdminAlert, message, wrappedMessage, default, false, true, clients);
}
public void SendAdminAlert(EntityUid player, string message, MindContainerComponent? mindContainerComponent = null)
public void SendAdminAlert(EntityUid player, string message, MindComponent? mindComponent = null)
{
if(mindContainerComponent == null && !_entityManager.TryGetComponent(player, out mindContainerComponent))
if(mindComponent == null && !_entityManager.TryGetComponent(player, out mindComponent))
{
SendAdminAlert(message);
return;
}
var adminSystem = _entityManager.System<AdminSystem>();
var antag = mindContainerComponent.Mind!.UserId != null
&& (adminSystem.GetCachedPlayerInfo(mindContainerComponent.Mind!.UserId.Value)?.Antag ?? false);
var antag = mindComponent.Mind!.UserId != null
&& (adminSystem.GetCachedPlayerInfo(mindComponent.Mind!.UserId.Value)?.Antag ?? false);
SendAdminAlert($"{mindContainerComponent.Mind!.Session?.Name}{(antag ? " (ANTAG)" : "")} {message}");
SendAdminAlert($"{mindComponent.Mind!.Session?.Name}{(antag ? " (ANTAG)" : "")} {message}");
}
public void SendHookOOC(string sender, string message)

2
Content.Server/Chat/Managers/IChatManager.cs
View File

@@ -24,7 +24,7 @@ namespace Content.Server.Chat.Managers
void SendHookOOC(string sender, string message);
void SendAdminAnnouncement(string message);
void SendAdminAlert(string message);
void SendAdminAlert(EntityUid player, string message, MindContainerComponent? mindContainerComponent = null);
void SendAdminAlert(EntityUid player, string message, MindComponent? mindComponent = null);
void ChatMessageToOne(ChatChannel channel, string message, string wrappedMessage, EntityUid source, bool hideChat,
INetChannel client, Color? colorOverride = null, bool recordReplay = false, string? audioPath = null, float audioVolume = 0);