(084340338) Add an aim timer before the weapon can be used. Fix a null reference exception.

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:54:33 +03:00
parent a2e40ed3eb
commit e9664d3639
28 changed files with 495 additions and 419 deletions
@@ -1768,6 +1768,10 @@ namespace Barotrauma
{
ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
}
if (!broken)
{
ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
}
ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
if (body == null || !body.Enabled || !inWater || ParentInventory != null || Removed) { return; }