mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 08:44:01 +00:00
Code Issues Projects Releases Wiki Activity

Updated a few tabs, updated SPL submodule

Browse Source
This commit is contained in:
SOF3 2016-10-03 01:59:06 +08:00
parent e913b16804
commit 4133f98b23
No known key found for this signature in database
GPG Key ID: A0379676C4D9D5D9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/level/generator/object/SpruceTree.php
View File

@ -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){

2
src/pocketmine/level/particle/FloatingTextParticle.php
View File

@ -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;
}

2
src/spl

@ -1 +1 @@
Subproject commit 6edaf9802cbada5e7638ceadfe042be9921376d8
Subproject commit f29eb41b4e99fd2f609c6d42a4425d5b6e940b80