mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-04-19 15:35:52 +00:00
Merge branch 'stable' of https://github.com/pmmp/pocketmine-mp into stable
This commit is contained in:
commit
2a51269305
@ -37,7 +37,7 @@
|
||||
"pocketmine/spl": "^0.4.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpstan/phpstan": "0.12.71",
|
||||
"phpstan/phpstan": "0.12.74",
|
||||
"phpstan/phpstan-phpunit": "^0.12.6",
|
||||
"phpstan/phpstan-strict-rules": "^0.12.2",
|
||||
"phpunit/phpunit": "^9.2"
|
||||
|
14
composer.lock
generated
14
composer.lock
generated
@ -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": "b0c6368d36038c48544f355ccecb3890",
|
||||
"content-hash": "2c3d44ba85e878b5862488bdba8878c8",
|
||||
"packages": [
|
||||
{
|
||||
"name": "adhocore/json-comment",
|
||||
@ -1002,16 +1002,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpstan/phpstan",
|
||||
"version": "0.12.71",
|
||||
"version": "0.12.74",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/phpstan/phpstan.git",
|
||||
"reference": "d508fa3b0ecc5fc91ac70c6c7ac2862f968ba2b5"
|
||||
"reference": "bc5f9483c8f461c86653dcbd040cf0d2778c91a2"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/d508fa3b0ecc5fc91ac70c6c7ac2862f968ba2b5",
|
||||
"reference": "d508fa3b0ecc5fc91ac70c6c7ac2862f968ba2b5",
|
||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/bc5f9483c8f461c86653dcbd040cf0d2778c91a2",
|
||||
"reference": "bc5f9483c8f461c86653dcbd040cf0d2778c91a2",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1042,7 +1042,7 @@
|
||||
"description": "PHPStan - PHP Static Analysis Tool",
|
||||
"support": {
|
||||
"issues": "https://github.com/phpstan/phpstan/issues",
|
||||
"source": "https://github.com/phpstan/phpstan/tree/0.12.71"
|
||||
"source": "https://github.com/phpstan/phpstan/tree/0.12.74"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -1058,7 +1058,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2021-02-01T18:24:00+00:00"
|
||||
"time": "2021-02-08T15:00:25+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpstan/phpstan-phpunit",
|
||||
|
@ -84,7 +84,6 @@ class CraftingDataPacket extends DataPacket{
|
||||
case self::ENTRY_SHAPELESS_CHEMISTRY:
|
||||
$entry["recipe_id"] = $this->getString();
|
||||
$ingredientCount = $this->getUnsignedVarInt();
|
||||
/** @var Item */
|
||||
$entry["input"] = [];
|
||||
for($j = 0; $j < $ingredientCount; ++$j){
|
||||
$entry["input"][] = $in = $this->getRecipeIngredient();
|
||||
|
Loading…
x
Reference in New Issue
Block a user