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

Block: fixed tile-stored properties sticking to the item in asItem()

Browse Source 
this was enabling duplication of items, since the dropped item object would contain a Block which still referenced the framed Item.
This commit is contained in:
Dylan K. Taylor 2023-05-31 21:48:06 +01:00
parent 4f4dca7fc0
commit 07225df936
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/block/Block.php
View File

@ -73,7 +73,8 @@ class Block{
private int $requiredBlockItemStateDataBits; private int $requiredBlockItemStateDataBits;
private int $requiredBlockOnlyStateDataBits; private int $requiredBlockOnlyStateDataBits;
private int $defaultBlockOnlyStateData;
private Block $defaultState;
/** /**
* @param string $name English name of the block type (TODO: implement translations) * @param string $name English name of the block type (TODO: implement translations)
@ -92,7 +93,7 @@ class Block{
$this->describeBlockOnlyState($calculator); $this->describeBlockOnlyState($calculator);
$this->requiredBlockOnlyStateDataBits = $calculator->getBitsUsed(); $this->requiredBlockOnlyStateDataBits = $calculator->getBitsUsed();
$this->defaultBlockOnlyStateData = $this->encodeBlockOnlyState(); $this->defaultState = clone $this;
} }
public function __clone(){ public function __clone(){
@ -193,10 +194,11 @@ class Block{
* Returns the block as an item. * Returns the block as an item.
* Block-only state such as facing, powered/unpowered, open/closed, etc., is discarded. * Block-only state such as facing, powered/unpowered, open/closed, etc., is discarded.
* Block-item state such as colour, wood type, etc. is preserved. * Block-item state such as colour, wood type, etc. is preserved.
* Complex state properties stored in the tile data (e.g. inventory) are discarded.
*/ */
public function asItem() : Item{ public function asItem() : Item{
$normalized = clone $this; $normalized = clone $this->defaultState;
$normalized->decodeBlockOnlyState($this->defaultBlockOnlyStateData); $normalized->decodeBlockItemState($this->encodeBlockItemState());
return new ItemBlock($normalized); return new ItemBlock($normalized);
} }