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

OnHitEntities now returns a bool and takes a read only list

Browse Source
This commit is contained in:
zumorica
2020-05-21 19:40:08 +02:00
parent 51f06c4142
commit 7cbd2fd8ce
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs
View File

@@ -75,8 +75,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
serializer.DataField(ref _cooldownTime, "cooldownTime", 1f);
}
public virtual void OnHitEntities(IEnumerable<IEntity> entities)
public virtual bool OnHitEntities(IReadOnlyList<IEntity> entities)
{
return false;
}
void IAttack.Attack(AttackEventArgs eventArgs)
@@ -105,7 +106,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
}
}
OnHitEntities(hitEntities);
if(OnHitEntities(hitEntities)) return;
var audioSystem = _entitySystemManager.GetEntitySystem<AudioSystem>();
var emitter = hitEntities.Count == 0 ? eventArgs.User : hitEntities[0];