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

Fix thrown throwing (#2723)

Browse Source 
Technically some stuff could be dependent upon the entity regardless if it's deleted but this is how ICollideBehavior does it (not by my design) so I figured we'd make it consistent.

If someone really needs the functionality even if it's deleted then they can refactor it.

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2020-12-08 22:21:12 +11:00
committed by GitHub
parent 5b561ae3e7
commit fe93f2ac30
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs
View File

@@ -52,7 +52,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
public void HitBy(ThrowCollideEventArgs eventArgs) public void HitBy(ThrowCollideEventArgs eventArgs)
{ {
if (!eventArgs.Thrown.TryGetComponent(out CreamPieComponent creamPie) || CreamPied) return; if (!eventArgs.Thrown.HasComponent<CreamPieComponent>() || CreamPied) return;
CreamPied = true; CreamPied = true;
Owner.PopupMessage(Loc.GetString("You have been creamed by {0:theName}!", eventArgs.Thrown)); Owner.PopupMessage(Loc.GetString("You have been creamed by {0:theName}!", eventArgs.Thrown));

2
Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
View File

@@ -624,11 +624,13 @@ namespace Content.Server.GameObjects.EntitySystems.Click
foreach (var comp in thrown.GetAllComponents<IThrowCollide>().ToArray()) foreach (var comp in thrown.GetAllComponents<IThrowCollide>().ToArray())
{ {
if (thrown.Deleted) break;
comp.DoHit(eventArgs); comp.DoHit(eventArgs);
} }
foreach (var comp in target.GetAllComponents<IThrowCollide>().ToArray()) foreach (var comp in target.GetAllComponents<IThrowCollide>().ToArray())
{ {
if (target.Deleted) break;
comp.HitBy(eventArgs); comp.HitBy(eventArgs);
} }
} }