(5a377a8ee) Unstable v0.9.1000.0

2020-05-13 12:55:42 -03:00
parent b143329701
commit a1ca41aa5d
426 changed files with 14384 additions and 5708 deletions
@@ -1,7 +1,7 @@
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.IO;
+using Barotrauma.IO;
 using System.Linq;
 using System.Text;

@@ -146,7 +146,7 @@ namespace Barotrauma
            {
                id += 1;
                IDfound = dictionary.ContainsKey(id);
-            } while (IDfound);
+            } while (IDfound || id == NullEntityID || id == EntitySpawnerID);
            return id;
        }