From: Hybrid Dog <ovvv@web.de>
Date: Mon, 5 Jun 2017 16:52:34 +0000 (+0200)
Subject: L-system: Fix leaves cutting through stems
X-Git-Tag: 5.0.0~955
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4493d47a51dee4c785c009897ee4702850921503;p=oweals%2Fminetest.git

L-system: Fix leaves cutting through stems
---

diff --git a/src/treegen.cpp b/src/treegen.cpp
index 574cc034d..25f614d27 100644
--- a/src/treegen.cpp
+++ b/src/treegen.cpp
@@ -542,10 +542,13 @@ void tree_trunk_placement(MMVManip &vmanip, v3f p0, TreeDef &tree_definition)
 	if (vmanip.m_area.contains(p1) == false)
 		return;
 	u32 vi = vmanip.m_area.index(p1);
-	if (vmanip.m_data[vi].getContent() != CONTENT_AIR
-			&& vmanip.m_data[vi].getContent() != CONTENT_IGNORE)
+	content_t current_node = vmanip.m_data[vi].getContent();
+	if (current_node != CONTENT_AIR && current_node != CONTENT_IGNORE
+			&& current_node != tree_definition.leavesnode.getContent()
+			&& current_node != tree_definition.leaves2node.getContent()
+			&& current_node != tree_definition.fruitnode.getContent())
 		return;
-	vmanip.m_data[vmanip.m_area.index(p1)] = tree_definition.trunknode;
+	vmanip.m_data[vi] = tree_definition.trunknode;
 }