vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed OnBroken & OnImpact statuseffects not being applied client-side

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-10-29 20:38:43 +02:00
parent 224e9238db
commit 33d971f5d0
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Items/Item.cs
+6
View File
@@ -381,6 +381,7 @@ namespace Barotrauma
(components[containerIndex] as ItemContainer).Inventory.ClientRead(type, msg, sendingTime); (components[containerIndex] as ItemContainer).Inventory.ClientRead(type, msg, sendingTime);
break; break;
case NetEntityEvent.Type.Status: case NetEntityEvent.Type.Status:
float prevCondition = condition;
condition = msg.ReadSingle(); condition = msg.ReadSingle();
if (FixRequirements.Count > 0) if (FixRequirements.Count > 0)
{ {
@@ -395,6 +396,11 @@ namespace Barotrauma
FixRequirements[i].Fixed = true; FixRequirements[i].Fixed = true;
} }
} }
if (prevCondition > 0.0f && condition <= 0.0f)
{
ApplyStatusEffects(ActionType.OnBroken, 1.0f);
}
break; break;
case NetEntityEvent.Type.ApplyStatusEffect: case NetEntityEvent.Type.ApplyStatusEffect:
ActionType actionType = (ActionType)msg.ReadRangedInteger(0, Enum.GetValues(typeof(ActionType)).Length - 1); ActionType actionType = (ActionType)msg.ReadRangedInteger(0, Enum.GetValues(typeof(ActionType)).Length - 1);
Barotrauma/BarotraumaShared/Source/Items/Item.cs
+1
View File
@@ -960,6 +960,7 @@ namespace Barotrauma
if (ImpactTolerance > 0.0f && impact > ImpactTolerance) if (ImpactTolerance > 0.0f && impact > ImpactTolerance)
{ {
ApplyStatusEffects(ActionType.OnImpact, 1.0f); ApplyStatusEffects(ActionType.OnImpact, 1.0f);
GameMain.Server?.CreateEntityEvent(this, new object[] { NetEntityEvent.Type.ApplyStatusEffect, ActionType.OnImpact });
} }
var containedItems = ContainedItems; var containedItems = ContainedItems;