diff --git a/composer.json b/composer.json index 35adb7adc..866935722 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,6 @@ "pocketmine/raklib": "^0.14.2", "pocketmine/raklib-ipc": "^0.1.0", "pocketmine/snooze": "^0.3.0", - "pocketmine/spl": "dev-master", "ramsey/uuid": "^4.1", "webmozart/path-util": "^2.3" }, diff --git a/composer.lock b/composer.lock index b2878d494..ffed79405 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": "9b3c01e7b850d45218b81a436f463011", + "content-hash": "94aedb2c8c81dd851b775b7b4e1467cb", "packages": [ { "name": "adhocore/json-comment", @@ -798,43 +798,6 @@ }, "time": "2021-11-01T20:50:08+00:00" }, - { - "name": "pocketmine/spl", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/pmmp/SPL.git", - "reference": "b7a8904f912c1f6d38ad867ff1120614ccb80171" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pmmp/SPL/zipball/b7a8904f912c1f6d38ad867ff1120614ccb80171", - "reference": "b7a8904f912c1f6d38ad867ff1120614ccb80171", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "require-dev": { - "phpstan/phpstan": "^0.12.8" - }, - "type": "library", - "autoload": { - "classmap": [ - "./src" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-3.0" - ], - "description": "Standard library files required by PocketMine-MP and related projects", - "support": { - "issues": "https://github.com/pmmp/SPL/issues", - "source": "https://github.com/pmmp/SPL/tree/master" - }, - "time": "2021-01-15T15:19:34+00:00" - }, { "name": "ramsey/collection", "version": "1.2.2", @@ -3493,8 +3456,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "pocketmine/bedrock-protocol": 20, - "pocketmine/spl": 20 + "pocketmine/bedrock-protocol": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/src/network/mcpe/InventoryManager.php b/src/network/mcpe/InventoryManager.php index b5271f5f9..07092d2ed 100644 --- a/src/network/mcpe/InventoryManager.php +++ b/src/network/mcpe/InventoryManager.php @@ -151,7 +151,7 @@ class InventoryManager{ return; } } - throw new \UnsupportedOperationException("Unsupported inventory type"); + throw new \LogicException("Unsupported inventory type"); } /** @phpstan-return ObjectSet */ diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php index ed910c45e..cf189d875 100644 --- a/src/network/mcpe/NetworkSession.php +++ b/src/network/mcpe/NetworkSession.php @@ -536,8 +536,6 @@ class NetworkSession{ /** * Instructs the remote client to connect to a different server. - * - * @throws \UnsupportedOperationException */ public function transfer(string $ip, int $port, string $reason = "transfer") : void{ $this->tryDisconnect(function() use ($ip, $port, $reason) : void{