From f2193d1ba7f0e58cbd6740cb554d95ee530355d4 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 12 Jul 2023 13:23:47 +0100 Subject: [PATCH] 1.20.10 --- composer.json | 8 ++--- composer.lock | 50 ++++++++++++++--------------- src/network/mcpe/NetworkSession.php | 6 ++-- 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/composer.json b/composer.json index 028af15bd..4e3d99392 100644 --- a/composer.json +++ b/composer.json @@ -34,10 +34,10 @@ "adhocore/json-comment": "~1.2.0", "fgrosse/phpasn1": "~2.5.0", "pocketmine/netresearch-jsonmapper": "~v4.2.999", - "pocketmine/bedrock-block-upgrade-schema": "~2.2.0+bedrock-1.20.0", - "pocketmine/bedrock-data": "~2.3.0+bedrock-1.20.0", - "pocketmine/bedrock-item-upgrade-schema": "~1.3.0+bedrock-1.20.0", - "pocketmine/bedrock-protocol": "~22.0.0+bedrock-1.20.0", + "pocketmine/bedrock-block-upgrade-schema": "~3.1.0+bedrock-1.20.10", + "pocketmine/bedrock-data": "~2.4.0+bedrock-1.20.10", + "pocketmine/bedrock-item-upgrade-schema": "~1.4.0+bedrock-1.20.10", + "pocketmine/bedrock-protocol": "~23.0.0+bedrock-1.20.10", "pocketmine/binaryutils": "^0.2.1", "pocketmine/callback-validator": "^1.0.2", "pocketmine/classloader": "^0.2.0", diff --git a/composer.lock b/composer.lock index 64b63f866..9c6d13de0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "01dabd17488f8f5a5ac5c65b9eb8eea4", + "content-hash": "390992e13478ee71580805f5f7d293a2", "packages": [ { "name": "adhocore/json-comment", @@ -198,16 +198,16 @@ }, { "name": "pocketmine/bedrock-block-upgrade-schema", - "version": "2.2.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockBlockUpgradeSchema.git", - "reference": "79bb3ad542ef19e828fdf1fa6adc54f1fa4b3bb5" + "reference": "6d4ae416043337946a22fc31e8065ca2c21f472d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/79bb3ad542ef19e828fdf1fa6adc54f1fa4b3bb5", - "reference": "79bb3ad542ef19e828fdf1fa6adc54f1fa4b3bb5", + "url": "https://api.github.com/repos/pmmp/BedrockBlockUpgradeSchema/zipball/6d4ae416043337946a22fc31e8065ca2c21f472d", + "reference": "6d4ae416043337946a22fc31e8065ca2c21f472d", "shasum": "" }, "type": "library", @@ -218,22 +218,22 @@ "description": "Schemas describing how to upgrade saved block data in older Minecraft: Bedrock Edition world saves", "support": { "issues": "https://github.com/pmmp/BedrockBlockUpgradeSchema/issues", - "source": "https://github.com/pmmp/BedrockBlockUpgradeSchema/tree/2.2.0" + "source": "https://github.com/pmmp/BedrockBlockUpgradeSchema/tree/3.1.0" }, - "time": "2023-05-04T21:49:36+00:00" + "time": "2023-07-12T12:05:36+00:00" }, { "name": "pocketmine/bedrock-data", - "version": "2.3.1+bedrock-1.20.0", + "version": "2.4.0+bedrock-1.20.10", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockData.git", - "reference": "fb89ccdc039252462d8d068a769635e24151b7e2" + "reference": "f98bd1cae46d2920058acf3b23c0bedeac79f4ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/fb89ccdc039252462d8d068a769635e24151b7e2", - "reference": "fb89ccdc039252462d8d068a769635e24151b7e2", + "url": "https://api.github.com/repos/pmmp/BedrockData/zipball/f98bd1cae46d2920058acf3b23c0bedeac79f4ab", + "reference": "f98bd1cae46d2920058acf3b23c0bedeac79f4ab", "shasum": "" }, "type": "library", @@ -244,22 +244,22 @@ "description": "Blobs of data generated from Minecraft: Bedrock Edition, used by PocketMine-MP", "support": { "issues": "https://github.com/pmmp/BedrockData/issues", - "source": "https://github.com/pmmp/BedrockData/tree/2.3.1+bedrock-1.20.0" + "source": "https://github.com/pmmp/BedrockData/tree/bedrock-1.20.10" }, - "time": "2023-06-13T16:42:09+00:00" + "time": "2023-07-12T11:51:54+00:00" }, { "name": "pocketmine/bedrock-item-upgrade-schema", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockItemUpgradeSchema.git", - "reference": "b16c59cfae08833f180dd82f88de7c1f43bc67c9" + "reference": "60d199afe5e371fd189b21d685ec1fed6ba54230" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/b16c59cfae08833f180dd82f88de7c1f43bc67c9", - "reference": "b16c59cfae08833f180dd82f88de7c1f43bc67c9", + "url": "https://api.github.com/repos/pmmp/BedrockItemUpgradeSchema/zipball/60d199afe5e371fd189b21d685ec1fed6ba54230", + "reference": "60d199afe5e371fd189b21d685ec1fed6ba54230", "shasum": "" }, "type": "library", @@ -270,22 +270,22 @@ "description": "JSON schemas for upgrading items found in older Minecraft: Bedrock world saves", "support": { "issues": "https://github.com/pmmp/BedrockItemUpgradeSchema/issues", - "source": "https://github.com/pmmp/BedrockItemUpgradeSchema/tree/1.3.0" + "source": "https://github.com/pmmp/BedrockItemUpgradeSchema/tree/1.4.0" }, - "time": "2023-05-18T15:34:32+00:00" + "time": "2023-07-12T12:08:37+00:00" }, { "name": "pocketmine/bedrock-protocol", - "version": "22.0.0+bedrock-1.20.0", + "version": "23.0.0+bedrock-1.20.10", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockProtocol.git", - "reference": "ceff28a0bd5d248f37fb97be3e836d536e37526e" + "reference": "0cfaafdc02cca882a50773d6c02ebfeb622614e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/ceff28a0bd5d248f37fb97be3e836d536e37526e", - "reference": "ceff28a0bd5d248f37fb97be3e836d536e37526e", + "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/0cfaafdc02cca882a50773d6c02ebfeb622614e2", + "reference": "0cfaafdc02cca882a50773d6c02ebfeb622614e2", "shasum": "" }, "require": { @@ -317,9 +317,9 @@ "description": "An implementation of the Minecraft: Bedrock Edition protocol in PHP", "support": { "issues": "https://github.com/pmmp/BedrockProtocol/issues", - "source": "https://github.com/pmmp/BedrockProtocol/tree/22.0.0+bedrock-1.20.0" + "source": "https://github.com/pmmp/BedrockProtocol/tree/23.0.0+bedrock-1.20.10" }, - "time": "2023-06-07T19:22:05+00:00" + "time": "2023-07-12T12:19:40+00:00" }, { "name": "pocketmine/binaryutils", diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php index d87c1b9a8..79118f1fa 100644 --- a/src/network/mcpe/NetworkSession.php +++ b/src/network/mcpe/NetworkSession.php @@ -84,6 +84,7 @@ use pocketmine\network\mcpe\protocol\types\AbilitiesLayer; use pocketmine\network\mcpe\protocol\types\BlockPosition; use pocketmine\network\mcpe\protocol\types\command\CommandData; use pocketmine\network\mcpe\protocol\types\command\CommandEnum; +use pocketmine\network\mcpe\protocol\types\command\CommandOverload; use pocketmine\network\mcpe\protocol\types\command\CommandParameter; use pocketmine\network\mcpe\protocol\types\command\CommandPermissions; use pocketmine\network\mcpe\protocol\types\DimensionIds; @@ -949,8 +950,9 @@ class NetworkSession{ 0, $aliasObj, [ - [CommandParameter::standard("args", AvailableCommandsPacket::ARG_TYPE_RAWTEXT, 0, true)] - ] + new CommandOverload(chaining: false, parameters: [CommandParameter::standard("args", AvailableCommandsPacket::ARG_TYPE_RAWTEXT, 0, true)]) + ], + chainedSubCommandData: [] ); $commandData[$command->getLabel()] = $data;