tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inline Name

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:25:51 +01:00
parent 61be228ad0
commit ee4ff9cfe8
97 changed files with 237 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Actions/Behaviors/IActionBehavior.cs
View File

@@ -37,7 +37,7 @@ namespace Content.Shared.Actions.Behaviors
ActionType = actionType;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Performer.Uid, out PerformerActions))
{
throw new InvalidOperationException($"performer {performer.Name} tried to perform action {actionType} " +
throw new InvalidOperationException($"performer {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(performer.Uid).EntityName} tried to perform action {actionType} " +
$" but the performer had no actions component," +
" which should never occur");
}

4
Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs
View File

@@ -43,8 +43,8 @@ namespace Content.Shared.Actions.Behaviors.Item
Item = item;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Item.Uid, out ItemActions))
{
throw new InvalidOperationException($"performer {performer.Name} tried to perform item action {actionType} " +
$" for item {Item.Name} but the item had no ItemActionsComponent," +
throw new InvalidOperationException($"performer {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(performer.Uid).EntityName} tried to perform item action {actionType} " +
$" for item {IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Item.Uid).EntityName} but the item had no ItemActionsComponent," +
" which should never occur");
}
}