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

Merge branch 'stable' into minor-next

Browse Source
This commit is contained in:
Dylan K. Taylor 2024-11-24 23:50:56 +00:00
commit 30ee0aa63d
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/block/CakeWithCandle.php
View File

@ -52,6 +52,9 @@ class CakeWithCandle extends BaseCake{
} }
public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{ public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
if($this->lit && $face !== Facing::UP){
return true;
}
if($this->onInteractCandle($item, $face, $clickVector, $player, $returnedItems)){ if($this->onInteractCandle($item, $face, $clickVector, $player, $returnedItems)){
return true; return true;
} }

1
src/network/mcpe/InventoryManager.php
View File

@ -592,7 +592,6 @@ class InventoryManager{
$info = $this->trackItemStack($entry, $slot, $itemStack, null); $info = $this->trackItemStack($entry, $slot, $itemStack, null);
$contents[] = new ItemStackWrapper($info->getStackId(), $itemStack); $contents[] = new ItemStackWrapper($info->getStackId(), $itemStack);
} }
$clearSlotWrapper = new ItemStackWrapper(0, ItemStack::null());
if($entry->complexSlotMap !== null){ if($entry->complexSlotMap !== null){
foreach($contents as $slotId => $info){ foreach($contents as $slotId => $info){
$packetSlot = $entry->complexSlotMap->mapCoreToNet($slotId) ?? null; $packetSlot = $entry->complexSlotMap->mapCoreToNet($slotId) ?? null;