Merge branch 'master' into virion-3.0

Author: inxomnyaa

src/CortexPE/Commando/PacketHooker.php

@@ -40,6 +40,7 @@
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\AvailableCommandsPacket;
 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\plugin\Plugin;
 use pocketmine\Server;
@@ -90,7 +91,7 @@ public static function register(Plugin $registrant): void {
 	 * @param CommandSender $cs
 	 * @param BaseCommand $command
 	 *
-	 * @return CommandParameter[][]
+	 * @return CommandOverload[][]
 	 */
 	private static function generateOverloads(CommandSender $cs, BaseCommand $command): array {
 		$overloads = [];
@@ -113,11 +114,10 @@ private static function generateOverloads(CommandSender $cs, BaseCommand $comman
 			$overloadList = self::generateOverloadList($subCommand);
 			if(!empty($overloadList)){
 				foreach($overloadList as $overload) {
-					array_unshift($overload, $scParam);
-					$overloads[] = $overload;
+					$overloads[] = new CommandOverload(false, [$scParam, ...$overload->getParameters()]);
 				}
 			} else {
-				$overloads[] = [$scParam];
+				$overloads[] = new CommandOverload(false, [$scParam]);
 			}
 		}
 
@@ -131,7 +131,7 @@ private static function generateOverloads(CommandSender $cs, BaseCommand $comman
 	/**
 	 * @param IArgumentable $argumentable
 	 *
-	 * @return CommandParameter[][]
+	 * @return CommandOverload[][]
 	 */
 	private static function generateOverloadList(IArgumentable $argumentable): array {
 		$input = $argumentable->getArgumentList();
@@ -154,7 +154,7 @@ private static function generateOverloadList(IArgumentable $argumentable): array
 					$refProp->setValue($param->enum, "enum#" . spl_object_id($param->enum));
 				}
 			}
-			$combinations[] = $set;
+			$combinations[] = new CommandOverload(false, $set);
 
 			foreach($indexes as $k => $v){
 				$indexes[$k]++;

virion.yml

@@ -1,5 +1,5 @@
 name: Commando
 antigen: CortexPE\Commando
 api: 4.0.0
-version: 3.1.0
+version: 3.2.0
 author: CortexPE