From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Sun, 13 Feb 2022 17:09:26 +0000 (+0100)
Subject: Fix NULL pointer bug in meshgen
X-Git-Tag: 0.2.2~5
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=bf2702ea411b5b5e481e610f232cec6439e4d7f6;p=dragonblocks_alpha.git

Fix NULL pointer bug in meshgen
---

diff --git a/src/client/blockmesh.c b/src/client/blockmesh.c
index 8af0151..25274e2 100644
--- a/src/client/blockmesh.c
+++ b/src/client/blockmesh.c
@@ -117,10 +117,12 @@ void blockmesh_make(MapBlock *block)
 
 	pthread_mutex_lock(&block->mtx);
 	if (extra->obj) {
-		extra->obj->remove = true;
+		if (obj) {
+			obj->scale = extra->obj->scale;
+			object_transform(obj);
+		}
 
-		obj->scale = extra->obj->scale;
-		object_transform(obj);
+		extra->obj->remove = true;
 	}
 
 	extra->obj = obj;