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

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ namespace Content.Server.Chat.Commands
return;
}
if (IoCManager.Resolve<IEntityManager>().HasComponent<GhostComponent>(playerEntity.Uid))
if (IoCManager.Resolve<IEntityManager>().HasComponent<GhostComponent>(playerEntity))
chat.SendDeadChat(player, message);
else
{

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

@@ -55,7 +55,7 @@ namespace Content.Server.Chat.Commands
_ => prototypeManager.Index<DamageTypePrototype>("Blunt")
},
200);
EntitySystem.Get<DamageableSystem>().TryChangeDamage(target.Uid, damage, true);
EntitySystem.Get<DamageableSystem>().TryChangeDamage(target, damage, true);
}
}
@@ -88,11 +88,11 @@ namespace Content.Server.Chat.Commands
EntitySystem.Get<AdminLogSystem>().Add(LogType.Suicide, $"{player.AttachedEntity} is committing suicide");
// Held item suicide
var handsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(owner.Uid);
var handsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(owner);
var itemComponent = handsComponent.GetActiveHand;
if (itemComponent != null)
{
var suicide = IoCManager.Resolve<IEntityManager>().GetComponents<ISuicideAct>(itemComponent.Owner.Uid).FirstOrDefault();
var suicide = IoCManager.Resolve<IEntityManager>().GetComponents<ISuicideAct>(itemComponent.Owner).FirstOrDefault();
if (suicide != null)
{
@@ -107,9 +107,9 @@ namespace Content.Server.Chat.Commands
{
foreach (var entity in entities)
{
if (IoCManager.Resolve<IEntityManager>().HasComponent<ItemComponent>(entity.Uid))
if (IoCManager.Resolve<IEntityManager>().HasComponent<ItemComponent>(entity))
continue;
var suicide = IoCManager.Resolve<IEntityManager>().GetComponents<ISuicideAct>(entity.Uid).FirstOrDefault();
var suicide = IoCManager.Resolve<IEntityManager>().GetComponents<ISuicideAct>(entity).FirstOrDefault();
if (suicide != null)
{
DealDamage(suicide, chat, owner);
@@ -126,7 +126,7 @@ namespace Content.Server.Chat.Commands
owner.PopupMessage(selfMessage);
DamageSpecifier damage = new(IoCManager.Resolve<IPrototypeManager>().Index<DamageTypePrototype>("Bloodloss"), 200);
EntitySystem.Get<DamageableSystem>().TryChangeDamage(owner.Uid, damage, true);
EntitySystem.Get<DamageableSystem>().TryChangeDamage(owner, damage, true);
// Prevent the player from returning to the body.
// Note that mind cannot be null because otherwise owner would be null.