From 4f6706284e99eb0f85fa200bcd064ba8c1cd8dce Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Fri, 21 Apr 2017 21:27:27 +0200
Subject: [PATCH] Sdk/World: Fix entity block handling

---
 SDK/include/NDK/World.inl | 3 ++-
 SDK/src/NDK/World.cpp     | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/SDK/include/NDK/World.inl b/SDK/include/NDK/World.inl
index 45d358ad4..4720ab3db 100644
--- a/SDK/include/NDK/World.inl
+++ b/SDK/include/NDK/World.inl
@@ -266,6 +266,7 @@ namespace Ndk
 	{
 		m_aliveEntities         = std::move(world.m_aliveEntities);
 		m_dirtyEntities         = std::move(world.m_dirtyEntities);
+		m_entityBlocks          = std::move(world.m_entityBlocks);
 		m_freeIdList            = std::move(world.m_freeIdList);
 		m_killedEntities        = std::move(world.m_killedEntities);
 		m_orderedSystems        = std::move(world.m_orderedSystems);
@@ -285,7 +286,7 @@ namespace Ndk
 
 	inline void World::Invalidate()
 	{
-		m_dirtyEntities.Resize(m_entities.size(), false);
+		m_dirtyEntities.Resize(m_entityBlocks.size(), false);
 		m_dirtyEntities.Set(true); // Activation of all bits
 	}
 
diff --git a/SDK/src/NDK/World.cpp b/SDK/src/NDK/World.cpp
index 3daf21e06..a40d5f175 100644
--- a/SDK/src/NDK/World.cpp
+++ b/SDK/src/NDK/World.cpp
@@ -68,6 +68,8 @@ namespace Ndk
 			m_freeIdList.pop_back();
 
 			entBlock = &m_entities[id];
+			entBlock->handle.Reset(&entBlock->entity); //< Reset handle (as it was reset when entity got destroyed)
+
 			m_entityBlocks[id] = entBlock;
 		}
 		else
@@ -114,6 +116,7 @@ namespace Ndk
 		// First, destruction of entities, then handles
 		// This is made to avoid that handle warn uselessly entities before their destruction
 		m_entities.clear();
+		m_entityBlocks.clear();
 
 		m_aliveEntities.Clear();
 		m_dirtyEntities.Clear();