From: SmallJoker <mk939@ymail.com>
Date: Sun, 10 Sep 2017 18:16:25 +0000 (+0200)
Subject: Object properties: Fix loss of custom selectionbox
X-Git-Tag: 5.0.0~841
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5f489efc69e5e8e31891481d412ad569a6e1bcf8;p=oweals%2Fminetest.git

Object properties: Fix loss of custom selectionbox
Only adjust it to the collisionbox value when the collisionbox was really set.
---

diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 3932321a7..9e1fed2f1 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -199,16 +199,18 @@ void read_object_properties(lua_State *L, int index,
 	getfloatfield(L, -1, "weight", prop->weight);
 
 	lua_getfield(L, -1, "collisionbox");
-	if(lua_istable(L, -1))
+	bool collisionbox_defined = lua_istable(L, -1);
+	if (collisionbox_defined)
 		prop->collisionbox = read_aabb3f(L, -1, 1.0);
 	lua_pop(L, 1);
 
 	lua_getfield(L, -1, "selectionbox");
 	if (lua_istable(L, -1))
 		prop->selectionbox = read_aabb3f(L, -1, 1.0);
-	else
+	else if (collisionbox_defined)
 		prop->selectionbox = prop->collisionbox;
 	lua_pop(L, 1);
+
 	getboolfield(L, -1, "pointable", prop->pointable);
 	getstringfield(L, -1, "visual", prop->visual);