(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-16 17:12:09 +03:00
parent bd07acf26d
commit 6262b3ea54
96 changed files with 1972 additions and 825 deletions
@@ -11,6 +11,12 @@ namespace Barotrauma.Items.Components
    {
        private float lastSentDeattachTimer;

+        private PhysicsBody trigger;
+
+        private Holdable holdable;
+
+        private float deattachTimer;
+
        [Serialize(1.0f, false)]
        public float DeattachDuration
        {
@@ -49,13 +55,7 @@ namespace Barotrauma.Items.Components
 #endif
            }
        }
-
-        private PhysicsBody trigger;
-
-        private Holdable holdable;
-
-        private float deattachTimer;
-        
+                
        public LevelResource(Item item, XElement element) : base(item, element)
        {
            IsActive = true;