From 79adbdeafe7e1d516722050728e2ea5b89f8fe95 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Wed, 15 Apr 2015 11:04:00 +0200
Subject: [PATCH] Fixed trees not generating trunk

---
 src/pocketmine/level/generator/object/SpruceTree.php | 6 +++---
 src/pocketmine/level/generator/object/Tree.php       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pocketmine/level/generator/object/SpruceTree.php b/src/pocketmine/level/generator/object/SpruceTree.php
index 59301020e..0ec37ede7 100644
--- a/src/pocketmine/level/generator/object/SpruceTree.php
+++ b/src/pocketmine/level/generator/object/SpruceTree.php
@@ -51,10 +51,10 @@ class SpruceTree extends Tree{
 			$yyy = $y + $this->treeHeight - $yy;
 
 			for($xx = $x - $radius; $xx <= $x + $radius; ++$xx){
-				$xOff = $xx - $x;
+				$xOff = abs($xx - $x);
 				for($zz = $z - $radius; $zz <= $z + $radius; ++$zz){
-					$zOff = $zz - $z;
-                    if(abs($xOff) === $radius and abs($zOff) === $radius and $radius > 0){
+					$zOff = abs($zz - $z);
+                    if(($xOff === 0 and $zOff === 0) or ($xOff === $radius and $zOff === $radius and $radius > 0)){
 						continue;
 					}
 
diff --git a/src/pocketmine/level/generator/object/Tree.php b/src/pocketmine/level/generator/object/Tree.php
index 331436836..b95069373 100644
--- a/src/pocketmine/level/generator/object/Tree.php
+++ b/src/pocketmine/level/generator/object/Tree.php
@@ -99,10 +99,10 @@ abstract class Tree{
 			$yOff = $yy - ($y + $this->treeHeight);
 			$mid = (int) (1 - $yOff / 2);
 			for($xx = $x - $mid; $xx <= $x + $mid; ++$xx){
-				$xOff = $xx - $x;
+				$xOff = abs($xx - $x);
 				for($zz = $z - $mid; $zz <= $z + $mid; ++$zz){
-					$zOff = $zz - $z;
-					if(abs($xOff) === $mid and abs($zOff) === $mid and ($yOff === 0 or $random->nextBoundedInt(2) === 0)){
+					$zOff = abs($zz - $z);
+					if(($xOff === 0 and $zOff === 0) or ($xOff === $mid and $zOff === $mid and ($yOff === 0 or $random->nextBoundedInt(2) === 0))){
 						continue;
 					}
 					$level->setBlockIdAt($xx, $yy, $zz, $this->leafBlock);