Networking bugfixes & optimization

2015-08-18 18:13:40 +03:00
parent bc4ea098f7
commit 00c64f0b20
35 changed files with 320 additions and 188 deletions
@@ -139,16 +139,17 @@ namespace Subsurface
            if (items[i] != null)
            {
                bool combined = false;
-                if (item.Combine(items[i]))
-                {
-                    //PutItem(item, i, false, false);
-                    combined = true;
-                }
-                //else if (items[i].Combine(item))
+                //if (item.Combine(items[i]))
                //{
-                //    //PutItem(items[i], i, false, false);
+                //    //PutItem(item, i, false, false);
                //    combined = true;
                //}
+                //else 
+                if (items[i].Combine(item))
+                {
+                    //PutItem(items[i], i, false, false);
+                    combined = true;
+                }

                if (!combined) return false;