mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-21 00:07:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable' into minor-next

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-05-30 16:08:03 +01:00
commit 3a4e958e84
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
9 changed files with 64 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/discord-release-notify.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3
- name: Setup PHP and tools
uses: shivammathur/setup-php@2.24.0
uses: shivammathur/setup-php@2.25.2
with:
php-version: 8.1

2
.github/workflows/draft-release.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
submodules: true
- name: Setup PHP
uses: shivammathur/setup-php@2.24.0
uses: shivammathur/setup-php@2.25.2
with:
php-version: 8.1

2
.github/workflows/main.yml vendored
View File

@ -203,7 +203,7 @@ jobs:
- uses: actions/checkout@v3
- name: Setup PHP and tools
uses: shivammathur/setup-php@2.24.0
uses: shivammathur/setup-php@2.25.2
with:
php-version: 8.1
tools: php-cs-fixer:3.16

2
build/php

@ -1 +1 @@
Subproject commit f860ade30acc074a98bbf5ff286f35b5eda10c86
Subproject commit f2ece7b30d0364eebf1d79497003cfda1dc41aa8

6
changelogs/4.20.md
View File

@ -71,3 +71,9 @@ Released 6th May 2023.
## Fixes
- Fixed players being forced into flight mode in every game mode.
- Moral of the story: do not assume anything in Mojang internals does what its name suggests...
# 4.20.5
Released 30th May 2023.
## Fixes
- Fixed server crash due to a bug in upstream dependency [`netresearch/jsonmapper`](https://github.com/cweiske/JsonMapper).

6
changelogs/4.21.md
View File

@ -69,3 +69,9 @@ Released 17th May 2023.
- Registered but ineligible ticking chunks are no longer rechecked every tick.
- This was causing wasted cycles during async worker backlog.
- The internal system must call `markTickingChunkForRecheck()` whenever a ticking chunk's eligibility for ticking has potentially changed, rather than just when it has changed from a yes to a no.
# 4.21.1
Released 30th May 2023.
## Fixes
- Fixed server crash due to a bug in upstream dependency [`netresearch/jsonmapper`](https://github.com/cweiske/JsonMapper).

10
composer.json
View File

@ -33,7 +33,7 @@
"composer-runtime-api": "^2.0",
"adhocore/json-comment": "^1.1",
"fgrosse/phpasn1": "^2.3",
"netresearch/jsonmapper": "^4.0",
"netresearch/jsonmapper": "dev-array-in-string-property-error as 4.2.0",
"pocketmine/bedrock-block-upgrade-schema": "~2.1.0+bedrock-1.19.80",
"pocketmine/bedrock-data": "~2.2.0+bedrock-1.19.80",
"pocketmine/bedrock-item-upgrade-schema": "~1.2.0+bedrock-1.19.80",
@ -93,5 +93,11 @@
"update-translation-apis": [
"@php build/generate-known-translation-apis.php"
]
}
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/dktapps/JsonMapper.git"
}
]
}

68
composer.lock generated
View File

@ -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": "e913903f9b2491e95e91e6d7f05e9540",
"content-hash": "41d697de292e1b730bb9aba724193317",
"packages": [
{
"name": "adhocore/json-comment",
@ -198,16 +198,16 @@
},
{
"name": "netresearch/jsonmapper",
"version": "v4.2.0",
"version": "dev-array-in-string-property-error",
"source": {
"type": "git",
"url": "https://github.com/cweiske/jsonmapper.git",
"reference": "f60565f8c0566a31acf06884cdaa591867ecc956"
"url": "https://github.com/dktapps/jsonmapper.git",
"reference": "4a82d1b98b99d682b660d6caa9b3816b2abc794c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956",
"reference": "f60565f8c0566a31acf06884cdaa591867ecc956",
"url": "https://api.github.com/repos/dktapps/jsonmapper/zipball/4a82d1b98b99d682b660d6caa9b3816b2abc794c",
"reference": "4a82d1b98b99d682b660d6caa9b3816b2abc794c",
"shasum": ""
},
"require": {
@ -227,7 +227,6 @@
"JsonMapper": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"OSL-3.0"
],
@ -243,9 +242,9 @@
"support": {
"email": "cweiske@cweiske.de",
"issues": "https://github.com/cweiske/jsonmapper/issues",
"source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0"
"source": "https://github.com/dktapps/jsonmapper/tree/array-in-string-property-error"
},
"time": "2023-04-09T17:37:40+00:00"
"time": "2023-05-30T13:10:31+00:00"
},
{
"name": "pocketmine/bedrock-block-upgrade-schema",
@ -507,6 +506,7 @@
"issues": "https://github.com/pmmp/ClassLoader/issues",
"source": "https://github.com/pmmp/ClassLoader/tree/0.2.0"
},
"abandoned": "pocketmine/pocketmine-mp",
"time": "2021-11-01T20:17:27+00:00"
},
{
@ -692,6 +692,7 @@
"issues": "https://github.com/pmmp/LogPthreads/issues",
"source": "https://github.com/pmmp/LogPthreads/tree/0.4.0"
},
"abandoned": "pocketmine/pocketmine-mp",
"time": "2021-11-01T21:42:09+00:00"
},
{
@ -1482,16 +1483,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.15.4",
"version": "v4.15.5",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290"
"reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
"reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e",
"reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e",
"shasum": ""
},
"require": {
@ -1532,9 +1533,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4"
"source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5"
},
"time": "2023-03-05T19:49:14+00:00"
"time": "2023-05-19T20:20:00+00:00"
},
{
"name": "phar-io/manifest",
@ -1711,16 +1712,16 @@
},
{
"name": "phpstan/phpstan-phpunit",
"version": "1.3.11",
"version": "1.3.13",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-phpunit.git",
"reference": "9e1b9de6d260461f6e99b6a8f2dbb0bbb98b579c"
"reference": "d8bdab0218c5eb0964338d24a8511b65e9c94fa5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/9e1b9de6d260461f6e99b6a8f2dbb0bbb98b579c",
"reference": "9e1b9de6d260461f6e99b6a8f2dbb0bbb98b579c",
"url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/d8bdab0218c5eb0964338d24a8511b65e9c94fa5",
"reference": "d8bdab0218c5eb0964338d24a8511b65e9c94fa5",
"shasum": ""
},
"require": {
@ -1757,9 +1758,9 @@
"description": "PHPUnit extensions and rules for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-phpunit/issues",
"source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.11"
"source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.13"
},
"time": "2023-03-25T19:42:13+00:00"
"time": "2023-05-26T11:05:59+00:00"
},
{
"name": "phpstan/phpstan-strict-rules",
@ -1812,16 +1813,16 @@
},
{
"name": "phpunit/php-code-coverage",
"version": "10.1.1",
"version": "10.1.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "884a0da7f9f46f28b2cb69134217fd810b793974"
"reference": "db1497ec8dd382e82c962f7abbe0320e4882ee4e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/884a0da7f9f46f28b2cb69134217fd810b793974",
"reference": "884a0da7f9f46f28b2cb69134217fd810b793974",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/db1497ec8dd382e82c962f7abbe0320e4882ee4e",
"reference": "db1497ec8dd382e82c962f7abbe0320e4882ee4e",
"shasum": ""
},
"require": {
@ -1878,7 +1879,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.1"
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.2"
},
"funding": [
{
@ -1886,7 +1887,7 @@
"type": "github"
}
],
"time": "2023-04-17T12:15:40+00:00"
"time": "2023-05-22T09:04:27+00:00"
},
{
"name": "phpunit/php-file-iterator",
@ -3192,9 +3193,18 @@
"time": "2021-07-28T10:34:58+00:00"
}
],
"aliases": [],
"aliases": [
{
"package": "netresearch/jsonmapper",
"version": "dev-array-in-string-property-error",
"alias": "4.2.0",
"alias_normalized": "4.2.0.0"
}
],
"minimum-stability": "stable",
"stability-flags": [],
"stability-flags": {
"netresearch/jsonmapper": 20
},
"prefer-stable": false,
"prefer-lowest": false,
"platform": {

2
src/VersionInfo.php
View File

@ -31,7 +31,7 @@ use function str_repeat;
final class VersionInfo{
public const NAME = "PocketMine-MP";
public const BASE_VERSION = "4.21.1";
public const BASE_VERSION = "4.21.2";
public const IS_DEVELOPMENT_BUILD = true;
public const BUILD_CHANNEL = "stable";