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

Fixes thrown items being stopped by open doors (#1399)

Browse Source 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
This commit is contained in:
Exp
2020-07-23 01:51:31 +02:00
committed by GitHub
parent a8b3c99075
commit 9585c7b82d
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/GameObjects/Components/Projectiles/ThrownItemComponent.cs
View File

@@ -19,6 +19,7 @@ namespace Content.Server.GameObjects.Components
public const float DefaultThrowTime = 0.25f; public const float DefaultThrowTime = 0.25f;
private bool _shouldCollide = true; private bool _shouldCollide = true;
private bool _shouldStop = false;
public override string Name => "ThrownItem"; public override string Name => "ThrownItem";
public override uint? NetID => ContentNetIDs.THROWN_ITEM; public override uint? NetID => ContentNetIDs.THROWN_ITEM;
@@ -31,6 +32,13 @@ namespace Content.Server.GameObjects.Components
void ICollideBehavior.CollideWith(IEntity entity) void ICollideBehavior.CollideWith(IEntity entity)
{ {
if (!_shouldCollide) return; if (!_shouldCollide) return;
if (entity.TryGetComponent(out CollidableComponent collid))
{
if (!collid.Hard) // ignore non hard
return;
_shouldStop = true; // hit something hard => stop after this collision
}
if (entity.TryGetComponent(out DamageableComponent damage)) if (entity.TryGetComponent(out DamageableComponent damage))
{ {
damage.TakeDamage(DamageType.Brute, 10, Owner, User); damage.TakeDamage(DamageType.Brute, 10, Owner, User);
@@ -68,7 +76,7 @@ namespace Content.Server.GameObjects.Components
void ICollideBehavior.PostCollide(int collideCount) void ICollideBehavior.PostCollide(int collideCount)
{ {
if (collideCount > 0) if (_shouldStop && collideCount > 0)
{ {
StopThrow(); StopThrow();
} }