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

Merge branch 'master' of https://github.com/Regalis11/Barotrauma

Browse Source
This commit is contained in:
juanjp600
2017-12-04 20:32:27 -03:00
parent 72e42bd257 243b3843b8
commit ca30b901a6
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Characters/Limb.cs
+2
View File
@@ -344,6 +344,7 @@ namespace Barotrauma
foreach (DamageModifier damageModifier in damageModifiers) foreach (DamageModifier damageModifier in damageModifiers)
{ {
if (damageModifier.DamageType == DamageType.None) continue;
if (damageModifier.DamageType.HasFlag(damageType) && SectorHit(damageModifier.ArmorSector, position)) if (damageModifier.DamageType.HasFlag(damageType) && SectorHit(damageModifier.ArmorSector, position))
{ {
appliedDamageModifiers.Add(damageModifier); appliedDamageModifiers.Add(damageModifier);
@@ -354,6 +355,7 @@ namespace Barotrauma
{ {
foreach (DamageModifier damageModifier in wearable.WearableComponent.DamageModifiers) foreach (DamageModifier damageModifier in wearable.WearableComponent.DamageModifiers)
{ {
if (damageModifier.DamageType == DamageType.None) continue;
if (damageModifier.DamageType.HasFlag(damageType) && SectorHit(damageModifier.ArmorSector, position)) if (damageModifier.DamageType.HasFlag(damageType) && SectorHit(damageModifier.ArmorSector, position))
{ {
appliedDamageModifiers.Add(damageModifier); appliedDamageModifiers.Add(damageModifier);
Barotrauma/BarotraumaShared/Source/Items/Components/Wearable.cs
+4 -1
View File
@@ -97,7 +97,10 @@ namespace Barotrauma.Items.Components
IsActive = true; IsActive = true;
limb[i] = equipLimb; limb[i] = equipLimb;
equipLimb.WearingItems.Add(wearableSprites[i]); if (!equipLimb.WearingItems.Contains(wearableSprites[i]))
{
equipLimb.WearingItems.Add(wearableSprites[i]);
}
} }
} }