mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 19:02:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-02-07 18:13:55 +00:00
parent 4140af459e ada8cbb545
commit fb1126797a
88 changed files with 543 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/block/BlockFactory.php
View File

@ -61,14 +61,14 @@ use function min;
*/
class BlockFactory{
/** @var \SplFixedArray|Block[] */
private static $fullList = null;
private static $fullList;
/** @var \SplFixedArray|int[] */
public static $lightFilter = null;
public static $lightFilter;
/** @var \SplFixedArray|bool[] */
public static $diffusesSkyLight = null;
public static $diffusesSkyLight;
/** @var \SplFixedArray|float[] */
public static $blastResistance = null;
public static $blastResistance;
/**
* Initializes the block factory. By default this is called only once on server start, however you may wish to use

2
src/block/Leaves.php
View File

@ -124,7 +124,7 @@ class Leaves extends Transparent{
}
public function getDrops(Item $item) : array{
if($item->getBlockToolType() & BlockToolType::SHEARS){
if(($item->getBlockToolType() & BlockToolType::SHEARS) !== 0){
return $this->getDropsForCompatibleTool($item);
}

2
src/block/Sign.php
View File

@ -155,7 +155,7 @@ class Sign extends Transparent{
throw new \UnexpectedValueException($author->getName() . " tried to write $size bytes of text onto a sign (bigger than max 1000)");
}
$removeFormat = $author->getRemoveFormat();
$ev = new SignChangeEvent($this, $author, new SignText(array_map(function(string $line) use ($removeFormat){
$ev = new SignChangeEvent($this, $author, new SignText(array_map(function(string $line) use ($removeFormat) : string{
return TextFormat::clean($line, $removeFormat);
}, $text->getLines())));
$ev->call();

2
src/block/Vine.php
View File

@ -130,7 +130,7 @@ class Vine extends Flowable{
}
public function getDrops(Item $item) : array{
if($item->getBlockToolType() & BlockToolType::SHEARS){
if(($item->getBlockToolType() & BlockToolType::SHEARS) !== 0){
return $this->getDropsForCompatibleTool($item);
}