Merged branch master into new-netcode

2016-09-16 13:45:19 -03:00
parent c20ffd2431 0265d075a5
commit e4f11e4679
4 changed files with 29 additions and 12 deletions
@@ -23,6 +23,8 @@ namespace Barotrauma.Items.Components
        {
            if (item.CurrentHull == null) return;

+            if (item.InWater) return;
+
            item.CurrentHull.Oxygen += oxygenFlow * deltaTime;
            OxygenFlow -= deltaTime * 1000.0f;
        }