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

Fixed server freeze due to bad light filter values

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-08-05 23:22:33 +01:00
parent 0ad4a59d5a
commit d5f6966ce3
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/pocketmine/block/Block.php
View File

@ -41,22 +41,22 @@ use pocketmine\plugin\Plugin;
class Block extends Position implements BlockIds, Metadatable{ class Block extends Position implements BlockIds, Metadatable{
/** @var \SplFixedArray */ /** @var \SplFixedArray<Block> */
public static $list = null; public static $list = null;
/** @var \SplFixedArray */ /** @var \SplFixedArray<Block> */
public static $fullList = null; public static $fullList = null;
/** @var \SplFixedArray */ /** @var \SplFixedArray<int> */
public static $light = null; public static $light = null;
/** @var \SplFixedArray */ /** @var \SplFixedArray<int> */
public static $lightFilter = null; public static $lightFilter = null;
/** @var \SplFixedArray */ /** @var \SplFixedArray<bool> */
public static $solid = null; public static $solid = null;
/** @var \SplFixedArray */ /** @var \SplFixedArray<float> */
public static $hardness = null; public static $hardness = null;
/** @var \SplFixedArray */ /** @var \SplFixedArray<bool> */
public static $transparent = null; public static $transparent = null;
/** @var \SplFixedArray */ /** @var \SplFixedArray<bool> */
public static $diffusesSkyLight = null; public static $diffusesSkyLight = null;
/** /**
@ -262,6 +262,12 @@ class Block extends Position implements BlockIds, Metadatable{
self::registerBlock(new Beetroot()); self::registerBlock(new Beetroot());
self::registerBlock(new Stonecutter()); self::registerBlock(new Stonecutter());
self::registerBlock(new GlowingObsidian()); self::registerBlock(new GlowingObsidian());
foreach(self::$list as $id => $block){
if($block === null){
self::registerBlock(new UnknownBlock($id));
}
}
} }
} }
@ -281,7 +287,7 @@ class Block extends Position implements BlockIds, Metadatable{
public static function registerBlock(Block $block, bool $override = false){ public static function registerBlock(Block $block, bool $override = false){
$id = $block->getId(); $id = $block->getId();
if(isset(self::$list[$id]) and !$override){ if(self::$list[$id] !== null and !(self::$list[$id] instanceof UnknownBlock) and !$override){
throw new \RuntimeException("Trying to overwrite an already registered block"); throw new \RuntimeException("Trying to overwrite an already registered block");
} }
@ -297,7 +303,7 @@ class Block extends Position implements BlockIds, Metadatable{
self::$transparent[$id] = $block->isTransparent(); self::$transparent[$id] = $block->isTransparent();
self::$hardness[$id] = $block->getHardness(); self::$hardness[$id] = $block->getHardness();
self::$light[$id] = $block->getLightLevel(); self::$light[$id] = $block->getLightLevel();
self::$lightFilter[$id] = $block->getLightFilter(); self::$lightFilter[$id] = $block->getLightFilter() + 1; //opacity plus 1 standard light filter
self::$diffusesSkyLight[$id] = $block->diffusesSkyLight(); self::$diffusesSkyLight[$id] = $block->diffusesSkyLight();
} }

4
src/pocketmine/block/UnknownBlock.php
View File

@ -25,10 +25,6 @@ namespace pocketmine\block;
class UnknownBlock extends Transparent{ class UnknownBlock extends Transparent{
public function isSolid(){
return false;
}
public function getHardness(){ public function getHardness(){
return 0; return 0;
} }