From 88f316bf93228a847ddfd03180a63091ef6e01cd Mon Sep 17 00:00:00 2001
From: Jett <55758076+Jettford@users.noreply.github.com>
Date: Thu, 4 Aug 2022 14:54:14 +0100
Subject: [PATCH] Add null checks to all free calls to prevent crash on server
 close. (#709)

---
 dNavigation/dNavMesh.cpp | 14 +++++++-------
 dPhysics/dpWorld.cpp     |  7 ++++---
 dPhysics/dpWorld.h       |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/dNavigation/dNavMesh.cpp b/dNavigation/dNavMesh.cpp
index c0bbf4b2..b3c8a229 100644
--- a/dNavigation/dNavMesh.cpp
+++ b/dNavigation/dNavMesh.cpp
@@ -28,13 +28,13 @@ dNavMesh::dNavMesh(uint32_t zoneId) {
 dNavMesh::~dNavMesh() {
 	// Clean up Recast information
 
-	rcFreeHeightField(m_Solid);
-	rcFreeCompactHeightfield(m_CHF);
-	rcFreeContourSet(m_CSet);
-	rcFreePolyMesh(m_PMesh);
-	rcFreePolyMeshDetail(m_PMDMesh);
-	dtFreeNavMesh(m_NavMesh);
-	dtFreeNavMeshQuery(m_NavQuery);
+	if(m_Solid) rcFreeHeightField(m_Solid);
+	if (m_CHF) rcFreeCompactHeightfield(m_CHF);
+	if (m_CSet) rcFreeContourSet(m_CSet);
+	if (m_PMesh) rcFreePolyMesh(m_PMesh);
+	if (m_PMDMesh) rcFreePolyMeshDetail(m_PMDMesh);
+	if (m_NavMesh) dtFreeNavMesh(m_NavMesh);
+	if (m_NavQuery) dtFreeNavMeshQuery(m_NavQuery);
 
 	if (m_Ctx) delete m_Ctx;
 	if (m_Triareas) delete[] m_Triareas;
diff --git a/dPhysics/dpWorld.cpp b/dPhysics/dpWorld.cpp
index 0a7e0df0..510da518 100644
--- a/dPhysics/dpWorld.cpp
+++ b/dPhysics/dpWorld.cpp
@@ -32,9 +32,10 @@ dpWorld::~dpWorld() {
 		m_Grid = nullptr;
 	}
 
-	m_NavMesh->~dNavMesh();
-	delete m_NavMesh;
-	m_NavMesh = nullptr;
+	if (m_NavMesh) {
+		delete m_NavMesh;
+		m_NavMesh = nullptr;
+	}
 }
 
 void dpWorld::StepWorld(float deltaTime) {
diff --git a/dPhysics/dpWorld.h b/dPhysics/dpWorld.h
index 9f13f7a9..3878cd12 100644
--- a/dPhysics/dpWorld.h
+++ b/dPhysics/dpWorld.h
@@ -42,5 +42,5 @@ private:
 	std::vector<dpEntity*> m_StaticEntities;
 	std::vector<dpEntity*> m_DynamicEntites;
 
-	dNavMesh* m_NavMesh;
+	dNavMesh* m_NavMesh = nullptr;
 };