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

Fixed fabricated items always appearing to be in full condition client-side (e.g. oxygen tanks which should be empty after being fabricated). Cherry-picked from 64896b0f. Closes #561

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-06-29 17:39:10 +03:00
parent 7f58e4619b
commit 274a29bada
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Items/Item.cs
+5 -8
View File
@@ -344,18 +344,18 @@ namespace Barotrauma
}
}
public Item(ItemPrefab itemPrefab, Vector2 position, Submarine submarine, float? spawnCondition = null)
public Item(ItemPrefab itemPrefab, Vector2 position, Submarine submarine)
: this(new Rectangle(
(int)(position.X - itemPrefab.sprite.size.X / 2),
(int)(position.Y + itemPrefab.sprite.size.Y / 2),
(int)itemPrefab.sprite.size.X,
(int)itemPrefab.sprite.size.Y),
itemPrefab, submarine, spawnCondition)
itemPrefab, submarine)
{
}
public Item(Rectangle newRect, ItemPrefab itemPrefab, Submarine submarine, float? spawnCondition = null)
public Item(Rectangle newRect, ItemPrefab itemPrefab, Submarine submarine)
: base(itemPrefab, submarine)
{
prefab = itemPrefab;
@@ -370,7 +370,7 @@ namespace Barotrauma
rect = newRect;
condition = (float)(spawnCondition ?? prefab.Health);
condition = prefab.Health;
lastSentCondition = condition;
XElement element = prefab.ConfigElement;
@@ -425,11 +425,8 @@ namespace Barotrauma
//and add them to the corresponding statuseffect list
foreach (List<StatusEffect> componentEffectList in ic.statusEffectLists.Values)
{
ActionType actionType = componentEffectList.First().type;
List<StatusEffect> statusEffectList;
if (!statusEffectLists.TryGetValue(actionType, out statusEffectList))
if (!statusEffectLists.TryGetValue(actionType, out List<StatusEffect> statusEffectList))
{
statusEffectList = new List<StatusEffect>();
statusEffectLists.Add(actionType, statusEffectList);