mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-14 17:59:41 +00:00
Code Issues Projects Releases Wiki Activity

Hacks for dealing with negative item IDs...

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-09-23 14:14:58 +01:00
parent 9d2e9e1663
commit ed1c511c3c
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,13 @@ class Block extends Position implements BlockIds, Metadatable{
* @return int * @return int
*/ */
public function getItemId() : int{ public function getItemId() : int{
return $this->itemId ?? $this->getId(); if($this->itemId !== null){
return $this->itemId;
}
if($this->id > 255){
return 255 - $this->id;
}
return $this->id;
} }
/** /**

12
src/pocketmine/block/BlockFactory.php
View File

@ -61,14 +61,14 @@ class BlockFactory{
* this if you need to reset the block factory back to its original defaults for whatever reason. * this if you need to reset the block factory back to its original defaults for whatever reason.
*/ */
public static function init() : void{ public static function init() : void{
self::$fullList = new \SplFixedArray(4096); self::$fullList = new \SplFixedArray(8192);
self::$getInterceptors = new \SplFixedArray(4096); self::$getInterceptors = new \SplFixedArray(8192);
self::$lightFilter = \SplFixedArray::fromArray(array_fill(0, 256, 1)); self::$lightFilter = \SplFixedArray::fromArray(array_fill(0, 512, 1));
self::$diffusesSkyLight = \SplFixedArray::fromArray(array_fill(0, 256, false)); self::$diffusesSkyLight = \SplFixedArray::fromArray(array_fill(0, 512, false));
self::$blastResistance = \SplFixedArray::fromArray(array_fill(0, 256, 0)); self::$blastResistance = \SplFixedArray::fromArray(array_fill(0, 512, 0));
self::$stateMasks = \SplFixedArray::fromArray(array_fill(0, 256, 0)); self::$stateMasks = \SplFixedArray::fromArray(array_fill(0, 512, 0));
self::registerBlock(new Air()); self::registerBlock(new Air());

7
src/pocketmine/item/ItemBlock.php
View File

@ -39,8 +39,15 @@ class ItemBlock extends Item{
* @param int|null $itemId * @param int|null $itemId
*/ */
public function __construct(int $blockId, int $meta = 0, int $itemId = null){ public function __construct(int $blockId, int $meta = 0, int $itemId = null){
if($blockId < 0){ //extended blocks
if($itemId === null){
$itemId = $blockId;
}
$blockId = 255 - $blockId;
}
$this->blockId = $blockId; $this->blockId = $blockId;
$this->setDamage($meta); $this->setDamage($meta);
parent::__construct($itemId ?? $blockId, $meta, $this->getBlock()->getName()); parent::__construct($itemId ?? $blockId, $meta, $this->getBlock()->getName());
} }