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

Merge branch 'stable'

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-01-29 20:01:30 +00:00
parent 5c4487c980 64b3d02974
commit 9492325eef
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/crafting/CraftingManager.php
View File

@ -248,6 +248,7 @@ class CraftingManager{
* @param Item[] $outputs * @param Item[] $outputs
* *
* @return CraftingRecipe[]|\Generator * @return CraftingRecipe[]|\Generator
* @phpstan-return \Generator<int, CraftingRecipe, void, void>
*/ */
public function matchRecipeByOutputs(array $outputs) : \Generator{ public function matchRecipeByOutputs(array $outputs) : \Generator{
//TODO: try to match special recipes before anything else (first they need to be implemented!) //TODO: try to match special recipes before anything else (first they need to be implemented!)

2
src/world/format/Chunk.php
View File

@ -320,12 +320,10 @@ class Chunk{
$light = 15; $light = 15;
for(; $y >= 0; --$y){ for(; $y >= 0; --$y){
if($light > 0){
$light -= BlockFactory::$lightFilter[$this->getFullBlock($x, $y, $z)]; $light -= BlockFactory::$lightFilter[$this->getFullBlock($x, $y, $z)];
if($light <= 0){ if($light <= 0){
break; break;
} }
}
$this->setBlockSkyLight($x, $y, $z, $light); $this->setBlockSkyLight($x, $y, $z, $light);
} }
} }