From 4ea43e0b0b35d78c9205380c20570b858415ddee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= <lynix680@gmail.com>
Date: Wed, 8 Mar 2017 17:36:13 +0100
Subject: [PATCH] Sdk/Entity: Fix problem when moving entities

---
 SDK/src/NDK/Entity.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SDK/src/NDK/Entity.cpp b/SDK/src/NDK/Entity.cpp
index 29b8f75df..7cdc87d07 100644
--- a/SDK/src/NDK/Entity.cpp
+++ b/SDK/src/NDK/Entity.cpp
@@ -30,6 +30,7 @@ namespace Ndk
 	m_enabled(entity.m_enabled),
 	m_valid(entity.m_valid)
 	{
+		entity.m_world = nullptr;
 	}
 
 	/*!
@@ -53,7 +54,8 @@ namespace Ndk
 
 	Entity::~Entity()
 	{
-		Destroy();
+		if (m_world)
+			Destroy();
 	}
 
 	/*!