From 1720d2d82dbe5ba13600bbafda22d30205762cd8 Mon Sep 17 00:00:00 2001
From: Ad5001 <mail@ad5001.eu>
Date: Sat, 13 May 2017 16:43:07 +0200
Subject: [PATCH] Some changes

---
 src/Ad5001/BetterGen/Main.php                 | 16 ++++++++++++
 .../BetterGen/generator/BetterNormal.php      |  2 +-
 src/Ad5001/BetterGen/structure/FallenTree.php | 25 +++++++++++++------
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/Ad5001/BetterGen/Main.php b/src/Ad5001/BetterGen/Main.php
index 8fe39cd..066499f 100644
--- a/src/Ad5001/BetterGen/Main.php
+++ b/src/Ad5001/BetterGen/Main.php
@@ -144,6 +144,22 @@ class Main extends PluginBase implements \pocketmine\event\Listener {
 				$this->getServer()->loadLevel($name);
 				return true;
 				break;
+				case "worldtp":
+				if(isset($args[0])) {
+					if(is_null($this->getServer()->getLevelByName($args[0]))) {
+						$this->getServer()->loadLevel($args[0]);
+						if(is_null($this->getServer()->getLevelByName($args[0]))) {
+							$sender->sendMessage("Could not find level {$args[0]}.");
+							return false;
+						}
+					}
+					$sender->teleport(\pocketmine\level\Position::fromObject($player, $this->getServer()->getLevelByName($args[0])));
+					$sender->sendMessage("§aTeleporting to {$args[0]}...");
+					return true;
+				} else {
+					return false;
+				}
+				break;
 		}
 	}
 	
diff --git a/src/Ad5001/BetterGen/generator/BetterNormal.php b/src/Ad5001/BetterGen/generator/BetterNormal.php
index cc33850..2e640be 100644
--- a/src/Ad5001/BetterGen/generator/BetterNormal.php
+++ b/src/Ad5001/BetterGen/generator/BetterNormal.php
@@ -97,7 +97,7 @@ class BetterNormal extends Generator {
 		$b = $this->selector->pickBiome($x + $xNoise - 1, $z + $zNoise - 1);
 		if ($b instanceof Mountainable && $this->random->nextBoundedInt(1000 ) < 3) {
 			$b = clone $b;
-			$b->setElevation($b->getMinElevation () + (50 * $b->getMinElevation () / 100), $b->getMaxElevation () + (50 * $b->getMinElevation () / 100));
+			// $b->setElevation($b->getMinElevation () + (50 * $b->getMinElevation () / 100), $b->getMaxElevation () + (50 * $b->getMinElevation () / 100));
 		}
 		return $b;
 	}
diff --git a/src/Ad5001/BetterGen/structure/FallenTree.php b/src/Ad5001/BetterGen/structure/FallenTree.php
index 8efdba3..7aa3b26 100644
--- a/src/Ad5001/BetterGen/structure/FallenTree.php
+++ b/src/Ad5001/BetterGen/structure/FallenTree.php
@@ -24,7 +24,7 @@ use Ad5001\BetterGen\utils\BuildingUtils;
 
 
 class FallenTree extends Object {
-	public $overridable = [ 
+	public static $overridable = [ 
 			Block::AIR => true,
 			6 => true,
 			17 => true,
@@ -58,6 +58,7 @@ class FallenTree extends Object {
 	 * @param $random pocketmine\utils\Random
 	 */
 	public function canPlaceObject(ChunkManager $level, $x, $y, $z, Random $random) {
+		echo "Checking at $x $y $z FallenTree\n";
 		$randomHeight = round($random->nextBoundedInt(6) - 3);
 		$this->length = $this->tree->trunkHeight + $randomHeight;
 		$this->direction = $random->nextBoundedInt(4);
@@ -65,17 +66,25 @@ class FallenTree extends Object {
 		switch($this->direction) {
 			case 0:
 			case 1:// Z+
-			if(in_array(false, BuildingUtils::fillCallback(new Vector3($x, $y, $z), new Vector3($x, $y, $z + $this->length), function($v3, $level) {
-				if(!in_array($level->getBlockIdAt($v3->x, $v3->y, $v3->z), $this->overridable)) return false;
-			}, $level))) {
+			$return = BuildingUtils::fillCallback(new Vector3($x, $y, $z), new Vector3($x, $y, $z + $this->length), function($v3, $level) {
+				if(!isset(\Ad5001\BetterGen\structure\FallenTree::$overridable[$level->getBlockIdAt($v3->x, $v3->y, $v3->z)])) {
+					echo $level->getBlockIdAt($v3->x, $v3->y, $v3->z) . " is not overridable";
+					return false;
+				}
+			}, $level);
+			if(in_array(false, $return, true)) {
 				return false;
 			}
 			break;
 			case 2:
 			case 3: // X+
-			if(in_array(false, BuildingUtils::fillCallback(new Vector3($x, $y, $z), new Vector3($x + $this->length, $y, $z), function($v3, $level) {
-				if(!in_array($level->getBlockIdAt($v3->x, $v3->y, $v3->z), $this->overridable)) return false;
-			}, $level))) {
+			$return = arra_BuildingUtils::fillCallback(new Vector3($x, $y, $z), new Vector3($x + $this->length, $y, $z), function($v3, $level) {
+				if(!isset(\Ad5001\BetterGen\structure\FallenTree::$overridable[$level->getBlockIdAt($v3->x, $v3->y, $v3->z)])) {
+					echo $level->getBlockIdAt($v3->x, $v3->y, $v3->z) . " is not overridable";
+					return false;
+				}
+			}, $level);
+			if(in_array(false, $return, true)) {
 				return false;
 			}
 			break;
@@ -131,7 +140,7 @@ class FallenTree extends Object {
 	 * @param $level pocketmine\level\ChunkManager
 	 */
 	public function placeBlock($x, $y, $z, ChunkManager $level) {
-		if (isset($this->overridable [$level->getBlockIdAt($x, $y, $z )] ) && ! isset($this->overridable [$level->getBlockIdAt($x, $y - 1, $z )] )) {
+		if (isset(self::$overridable [$level->getBlockIdAt($x, $y, $z )] ) && ! isset(self::$overridable [$level->getBlockIdAt($x, $y - 1, $z )] )) {
 			$level->setBlockIdAt($x, $y, $z, $this->trunk [0]);
 			$level->setBlockDataAt($x, $y, $z, $this->trunk [1]);
 		}