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

Inline HasComponent entirely

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 12:23:18 +01:00
parent 88141ae6b8
commit 0feebbff00
117 changed files with 201 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Chat/Commands/SayCommand.cs
View File

@@ -5,6 +5,7 @@ using Content.Server.Players;
using Robust.Server.Player;
using Robust.Shared.Console;
using Robust.Shared.Enums;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.Server.Chat.Commands
@@ -45,7 +46,7 @@ namespace Content.Server.Chat.Commands
return;
}
if (playerEntity.HasComponent<GhostComponent>())
if (IoCManager.Resolve<IEntityManager>().HasComponent<GhostComponent>(playerEntity.Uid))
chat.SendDeadChat(player, message);
else
{

2
Content.Server/Chat/Commands/SuicideCommand.cs
View File

@@ -107,7 +107,7 @@ namespace Content.Server.Chat.Commands
{
foreach (var entity in entities)
{
if (entity.HasComponent<ItemComponent>())
if (IoCManager.Resolve<IEntityManager>().HasComponent<ItemComponent>(entity.Uid))
continue;
var suicide = IoCManager.Resolve<IEntityManager>().GetComponents<ISuicideAct>(entity.Uid).FirstOrDefault();
if (suicide != null)

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

@@ -153,7 +153,7 @@ namespace Content.Server.Chat.Managers
var transform = player.AttachedEntity.Transform;
if (transform.MapID != sourceMapId ||
!player.AttachedEntity.HasComponent<GhostComponent>() &&
!IoCManager.Resolve<IEntityManager>().HasComponent<GhostComponent>(player.AttachedEntity.Uid) &&
!sourceCoords.InRange(_entManager, transform.Coordinates, VoiceRange)) continue;
clients.Add(player.ConnectedClient);