diff --git a/src/pocketmine/level/generator/object/SpruceTree.php b/src/pocketmine/level/generator/object/SpruceTree.php index 090958728..beaf15d17 100644 --- a/src/pocketmine/level/generator/object/SpruceTree.php +++ b/src/pocketmine/level/generator/object/SpruceTree.php @@ -54,7 +54,7 @@ class SpruceTree extends Tree{ $xOff = abs($xx - $x); for($zz = $z - $radius; $zz <= $z + $radius; ++$zz){ $zOff = abs($zz - $z); - if($xOff === $radius and $zOff === $radius and $radius > 0){ + if($xOff === $radius and $zOff === $radius and $radius > 0){ continue; } @@ -62,10 +62,10 @@ class SpruceTree extends Tree{ $level->setBlockIdAt($xx, $yyy, $zz, $this->leafBlock); $level->setBlockDataAt($xx, $yyy, $zz, $this->type); } - } - } + } + } - if($radius >= $maxR){ + if($radius >= $maxR){ $radius = $minR; $minR = 1; if(++$maxR > $lRadius){ diff --git a/src/pocketmine/level/particle/FloatingTextParticle.php b/src/pocketmine/level/particle/FloatingTextParticle.php index 800f33366..d15be5f6e 100644 --- a/src/pocketmine/level/particle/FloatingTextParticle.php +++ b/src/pocketmine/level/particle/FloatingTextParticle.php @@ -94,7 +94,7 @@ class FloatingTextParticle extends Particle{ Entity::DATA_NAMETAG => [Entity::DATA_TYPE_STRING, $this->title . ($this->text !== "" ? "\n" . $this->text : "")], Entity::DATA_SHOW_NAMETAG => [Entity::DATA_TYPE_BYTE, 1], Entity::DATA_NO_AI => [Entity::DATA_TYPE_BYTE, 1] - ]; + ]; $p[] = $pk; } diff --git a/src/spl b/src/spl index 6edaf9802..f29eb41b4 160000 --- a/src/spl +++ b/src/spl @@ -1 +1 @@ -Subproject commit 6edaf9802cbada5e7638ceadfe042be9921376d8 +Subproject commit f29eb41b4e99fd2f609c6d42a4425d5b6e940b80