Merge branch 'dev' into next_version

src/DebugUtils/MetaAttributes/MetaIDAttribute.cs

@@ -185,7 +185,7 @@ namespace DCFApixels.DragonECS
 
             public bool IsCollidingID(string id)
             {
-                if(_collidingIDs== null)
+                if (_collidingIDs == null)
                 {
                     return false;
                 }

src/EcsWorld.cs

@@ -436,7 +436,7 @@ namespace DCFApixels.DragonECS
         {
             for (int i = _emptyEntitiesCount - 1; i >= 0; i--)
             {
-                if(_emptyEntities[i] == entityID)
+                if (_emptyEntities[i] == entityID)
                 {
                     _emptyEntities[i] = _emptyEntities[--_emptyEntitiesCount];
                     return true;
@@ -852,7 +852,7 @@ namespace DCFApixels.DragonECS
             }
             _emptyEntitiesCount = 0;
 
-            if(count < 0)
+            if (count < 0)
             {
                 count = _delEntBufferCount;
             }

src/EcsWorld.pools.cs

@@ -314,7 +314,7 @@ namespace DCFApixels.DragonECS
                 slot.count++;
                 slot.version++;
                 var count = _entities[entityID].componentsCount++;
-                if(count == 0 && IsUsed(entityID))
+                if (count == 0 && IsUsed(entityID))
                 {
                     RemoveFromEmptyEntities(entityID);
                 }

src/EcsWorld.static.cs

@@ -45,10 +45,15 @@ namespace DCFApixels.DragonECS
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool TryGetWorld(short worldID, out EcsWorld world)
         {// ts
+            if (worldID >= _worlds.Length)
+            {
+                world = null;
+                return false;
+            }
             world = _worlds[worldID];
             return
                 world != null &&
-                world.IsDestroyed != false &&
+                world.IsDestroyed == false &&
                 worldID != 0;
         }
 

src/Executors/EcsWhereToGroupExecutor.cs

@@ -69,19 +69,19 @@ namespace DCFApixels.DragonECS.Internal
                 _version++;
                 _iterator.IterateTo(World.Entities, _filteredAllGroup);
 #if DEBUG && DRAGONECS_DEEP_DEBUG
-                if(_filteredGroup == null)
+                if (_filteredGroup == null)
                 {
                     _filteredGroup = EcsGroup.New(World);
                 }
                 _filteredGroup.Clear();
                 foreach (var e in World.Entities)
                 {
-                    if(World.IsMatchesMask(Mask, e))
+                    if (World.IsMatchesMask(Mask, e))
                     {
                         _filteredGroup.Add(e);
                     }
                 }
-                if(_filteredAllGroup.SetEquals(_filteredGroup) == false)
+                if (_filteredAllGroup.SetEquals(_filteredGroup) == false)
                 {
                     throw new System.InvalidOperationException();
                 }

src/Internal/BitsUtility.cs

@@ -538,7 +538,7 @@ namespace DCFApixels.DragonECS.Internal
                 state ^= state >> 17;
                 state ^= state << 5;
                 return state;
-            };
+            }
         }
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static long NextXorShiftState(long state)

src/Pools/EcsPool.cs

@@ -590,7 +590,7 @@ namespace DCFApixels.DragonECS
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void RemoveListener(IEcsPoolEventListener listener) { _pool.AddListener(listener); }
 #endif
-#endregion
+        #endregion
 
         #region Convertors
         public static implicit operator ReadonlyEcsPool<T>(EcsPool<T> a) { return new ReadonlyEcsPool<T>(a); }

src/entlong.cs

@@ -464,6 +464,8 @@ namespace DCFApixels.DragonECS
                 a.gen != b.gen ||
                 a.world != b.world;
         }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static explicit operator EntitySlotInfo(entlong a) { return new EntitySlotInfo(a._full); }
         #endregion
 
         #region Other