Merge branch 'stable' into next-minor

src/MemoryManager.php

@@ -508,8 +508,13 @@ class MemoryManager{
 				return "(error) ARRAY RECURSION LIMIT REACHED";
 			}
 			$data = [];
+			$numeric = 0;
 			foreach($from as $key => $value){
-				$data[$key] = self::continueDump($value, $objects, $refCounts, $recursion + 1, $maxNesting, $maxStringSize);
+				$data[$numeric] = [
+					"k" => self::continueDump($key, $objects, $refCounts, $recursion + 1, $maxNesting, $maxStringSize),
+					"v" => self::continueDump($value, $objects, $refCounts, $recursion + 1, $maxNesting, $maxStringSize),
+				];
+				$numeric++;
 			}
 		}elseif(is_string($from)){
 			$data = "(string) len(" . strlen($from) . ") " . substr(Utils::printable($from), 0, $maxStringSize);

src/block/tile/BrewingStand.php

@@ -148,18 +148,20 @@ class BrewingStand extends Spawnable implements Container, Nameable{
 	 * @phpstan-return array<int, BrewingRecipe>
 	 */
 	private function getBrewableRecipes() : array{
-		if($this->inventory->getItem(BrewingStandInventory::SLOT_INGREDIENT)->isNull()){
+		$ingredient = $this->inventory->getItem(BrewingStandInventory::SLOT_INGREDIENT);
+		if($ingredient->isNull()){
 			return [];
 		}
 
 		$recipes = [];
+		$craftingManager = $this->position->getWorld()->getServer()->getCraftingManager();
 		foreach([BrewingStandInventory::SLOT_BOTTLE_LEFT, BrewingStandInventory::SLOT_BOTTLE_MIDDLE, BrewingStandInventory::SLOT_BOTTLE_RIGHT] as $slot){
 			$input = $this->inventory->getItem($slot);
 			if($input->isNull()){
 				continue;
 			}
 
-			if(($recipe = $this->position->getWorld()->getServer()->getCraftingManager()->matchBrewingRecipe($input, $this->inventory->getItem(BrewingStandInventory::SLOT_INGREDIENT))) !== null){
+			if(($recipe = $craftingManager->matchBrewingRecipe($input, $ingredient)) !== null){
 				$recipes[$slot] = $recipe;
 			}
 		}

src/command/defaults/DumpMemoryCommand.php

@@ -44,7 +44,7 @@ class DumpMemoryCommand extends VanillaCommand{
 			return true;
 		}
 
-		$sender->getServer()->getMemoryManager()->dumpServerMemory($args[0] ?? (Path::join($sender->getServer()->getDataPath(), "memory_dumps" . date("D_M_j-H.i.s-T_Y"))), 48, 80);
+		$sender->getServer()->getMemoryManager()->dumpServerMemory($args[0] ?? (Path::join($sender->getServer()->getDataPath(), "memory_dumps", date("D_M_j-H.i.s-T_Y"))), 48, 80);
 		return true;
 	}
 }

src/inventory/PlayerInventory.php

@@ -49,7 +49,7 @@ class PlayerInventory extends SimpleInventory{
 	}
 
 	public function isHotbarSlot(int $slot) : bool{
-		return $slot >= 0 && $slot <= $this->getHotbarSize();
+		return $slot >= 0 && $slot < $this->getHotbarSize();
 	}
 
 	/**

src/network/mcpe/InventoryManager.php

@@ -37,6 +37,7 @@ use pocketmine\inventory\Inventory;
 use pocketmine\inventory\transaction\action\SlotChangeAction;
 use pocketmine\inventory\transaction\InventoryTransaction;
 use pocketmine\item\Item;
+use pocketmine\network\mcpe\convert\TypeConversionException;
 use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\protocol\ClientboundPacket;
 use pocketmine\network\mcpe\protocol\ContainerClosePacket;
@@ -50,7 +51,9 @@ use pocketmine\network\mcpe\protocol\types\BlockPosition;
 use pocketmine\network\mcpe\protocol\types\inventory\ContainerIds;
 use pocketmine\network\mcpe\protocol\types\inventory\CreativeContentEntry;
 use pocketmine\network\mcpe\protocol\types\inventory\ItemStackWrapper;
+use pocketmine\network\mcpe\protocol\types\inventory\NetworkInventoryAction;
 use pocketmine\network\mcpe\protocol\types\inventory\WindowTypes;
+use pocketmine\network\PacketHandlingException;
 use pocketmine\player\Player;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\ObjectSet;
@@ -145,6 +148,24 @@ class InventoryManager{
 		}
 	}
 
+	/**
+	 * @param NetworkInventoryAction[] $networkInventoryActions
+	 * @throws PacketHandlingException
+	 */
+	public function addPredictedSlotChanges(array $networkInventoryActions) : void{
+		foreach($networkInventoryActions as $action){
+			if($action->sourceType === NetworkInventoryAction::SOURCE_CONTAINER && isset($this->windowMap[$action->windowId])){
+				//this won't cover stuff like crafting grid due to too much magic
+				try{
+					$item = TypeConverter::getInstance()->netItemStackToCore($action->newItem->getItemStack());
+				}catch(TypeConversionException $e){
+					throw new PacketHandlingException($e->getMessage(), 0, $e);
+				}
+				$this->initiatedSlotChanges[$action->windowId][$action->inventorySlot] = $item;
+			}
+		}
+	}
+
 	public function onCurrentWindowChange(Inventory $inventory) : void{
 		$this->onCurrentWindowRemove();
 		$this->add($this->lastInventoryNetworkId = max(ContainerIds::FIRST, ($this->lastInventoryNetworkId + 1) % self::RESERVED_WINDOW_ID_RANGE_START), $inventory);

src/network/mcpe/handler/InGamePacketHandler.php

@@ -411,6 +411,7 @@ class InGamePacketHandler extends PacketHandler{
 
 	private function handleUseItemTransaction(UseItemTransactionData $data) : bool{
 		$this->player->selectHotbarSlot($data->getHotbarSlot());
+		$this->inventoryManager->addPredictedSlotChanges($data->getActions());
 
 		switch($data->getActionType()){
 			case UseItemTransactionData::ACTION_CLICK_BLOCK:
@@ -500,6 +501,7 @@ class InGamePacketHandler extends PacketHandler{
 		}
 
 		$this->player->selectHotbarSlot($data->getHotbarSlot());
+		$this->inventoryManager->addPredictedSlotChanges($data->getActions());
 
 		//TODO: use transactiondata for rollbacks here
 		switch($data->getActionType()){
@@ -520,6 +522,7 @@ class InGamePacketHandler extends PacketHandler{
 
 	private function handleReleaseItemTransaction(ReleaseItemTransactionData $data) : bool{
 		$this->player->selectHotbarSlot($data->getHotbarSlot());
+		$this->inventoryManager->addPredictedSlotChanges($data->getActions());
 
 		//TODO: use transactiondata for rollbacks here (resending entire inventory is very wasteful)
 		switch($data->getActionType()){

src/utils/Internet.php

@@ -160,7 +160,7 @@ class Internet{
 	 *
 	 * @param string[]|string $args
 	 * @param string[]        $extraHeaders
-	 * @param string|null     $err reference parameter, will be set to the output of curl_error(). Use this to retrieve errors that occured during the operation.
+	 * @param string|null     $err reference parameter, will be set to the output of curl_error(). Use this to retrieve errors that occurred during the operation.
 	 * @phpstan-param string|array<string, string> $args
 	 * @phpstan-param list<string>                 $extraHeaders
 	 */

src/world/format/io/data/BedrockWorldData.php

@@ -29,14 +29,12 @@ use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\StringTag;
 use pocketmine\nbt\TreeRoot;
-use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\utils\Binary;
 use pocketmine\utils\Filesystem;
 use pocketmine\utils\Limits;
 use pocketmine\world\format\io\exception\CorruptedWorldException;
 use pocketmine\world\format\io\exception\UnsupportedWorldFormatException;
 use pocketmine\world\generator\Flat;
-use pocketmine\world\generator\Generator;
 use pocketmine\world\generator\GeneratorManager;
 use pocketmine\world\World;
 use pocketmine\world\WorldCreationOptions;
@@ -50,6 +48,12 @@ use function time;
 class BedrockWorldData extends BaseNbtWorldData{
 
 	public const CURRENT_STORAGE_VERSION = 8;
+	/**
+	 * WARNING: In the future, this should be only as high as the newest world format currently supported. We don't
+	 * actually support worlds from 1.18.10 yet, but due to an old stupid bug, all worlds created by PM will report this
+	 * version.
+	 */
+	public const CURRENT_STORAGE_NETWORK_VERSION = 486; // 1.18.10
 
 	public const GENERATOR_LIMITED = 0;
 	public const GENERATOR_INFINITE = 1;
@@ -74,7 +78,7 @@ class BedrockWorldData extends BaseNbtWorldData{
 			->setInt("Generator", $generatorType)
 			->setLong("LastPlayed", time())
 			->setString("LevelName", $name)
-			->setInt("NetworkVersion", ProtocolInfo::CURRENT_PROTOCOL)
+			->setInt("NetworkVersion", self::CURRENT_STORAGE_NETWORK_VERSION)
 			//->setInt("Platform", 2) //TODO: find out what the possible values are for
 			->setLong("RandomSeed", $options->getSeed())
 			->setInt("SpawnX", $options->getSpawnPosition()->getFloorX())
@@ -161,7 +165,7 @@ class BedrockWorldData extends BaseNbtWorldData{
 	}
 
 	public function save() : void{
-		$this->compoundTag->setInt("NetworkVersion", ProtocolInfo::CURRENT_PROTOCOL);
+		$this->compoundTag->setInt("NetworkVersion", self::CURRENT_STORAGE_NETWORK_VERSION);
 		$this->compoundTag->setInt("StorageVersion", self::CURRENT_STORAGE_VERSION);
 
 		$nbt = new LittleEndianNbtSerializer();