From ce9b25e97a14c702d5be1b221f6c7b3356e8b5c2 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 22 Jan 2023 20:44:26 +0000 Subject: [PATCH 01/13] Release 4.12.11 --- changelogs/4.12.md | 13 +++++++++++++ src/VersionInfo.php | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/changelogs/4.12.md b/changelogs/4.12.md index 8878a42f5..068fefab4 100644 --- a/changelogs/4.12.md +++ b/changelogs/4.12.md @@ -104,3 +104,16 @@ Released 18th January 2023. ## Note about server load & performance This version will report higher apparent server load than previous versions. The actual performance of the server is unchanged; the previous reported load was inaccurate. These bugs have been present for nearly 5 years (ever since the first introduction of Snooze in 3.0.0). + +# 4.12.11 +Released 22nd January 2023. + +## General +- Code is now tested and analysed using PHP 8.2 in addition to 8.1 and 8.0. + +## Fixes +- Fixed pthreads 5.0.0 incorrectly being treated as compatible. +- Fixed deprecation errors on PHP 8.2. + +## Documentation +- Updated documentation in `PlayerPreLoginEvent`. diff --git a/src/VersionInfo.php b/src/VersionInfo.php index fe876727a..f884a0fb9 100644 --- a/src/VersionInfo.php +++ b/src/VersionInfo.php @@ -32,7 +32,7 @@ use function str_repeat; final class VersionInfo{ public const NAME = "PocketMine-MP"; public const BASE_VERSION = "4.12.11"; - public const IS_DEVELOPMENT_BUILD = true; + public const IS_DEVELOPMENT_BUILD = false; public const BUILD_CHANNEL = "stable"; private function __construct(){ From 608fcd6cd70007a11dd49c5dc1ac6e07a0b42240 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 22 Jan 2023 20:44:31 +0000 Subject: [PATCH 02/13] 4.12.12 is next --- src/VersionInfo.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/VersionInfo.php b/src/VersionInfo.php index f884a0fb9..05a46d15d 100644 --- a/src/VersionInfo.php +++ b/src/VersionInfo.php @@ -31,8 +31,8 @@ use function str_repeat; final class VersionInfo{ public const NAME = "PocketMine-MP"; - public const BASE_VERSION = "4.12.11"; - public const IS_DEVELOPMENT_BUILD = false; + public const BASE_VERSION = "4.12.12"; + public const IS_DEVELOPMENT_BUILD = true; public const BUILD_CHANNEL = "stable"; private function __construct(){ From bd3e9e1cad1d788f587a6e92a5ea0b5a02030dc6 Mon Sep 17 00:00:00 2001 From: Dylan T Date: Mon, 23 Jan 2023 20:13:29 +0000 Subject: [PATCH 03/13] Do not allow more than 1 run to compile PHP at a time this causes cache collisions and build failures --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 913a575f3..6e5d22e0b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,6 +9,7 @@ jobs: build-php: name: Prepare PHP runs-on: ${{ matrix.image }} + concurrency: php-build-${{ matrix.php }} strategy: matrix: From 18013e95514984d54210ffcbb27a951b859d7fde Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Jan 2023 13:51:50 +0000 Subject: [PATCH 04/13] Bump build/php from `b479ec4` to `af250d7` (#5527) Bumps [build/php](https://github.com/pmmp/php-build-scripts) from `b479ec4` to `af250d7`. - [Release notes](https://github.com/pmmp/php-build-scripts/releases) - [Commits](https://github.com/pmmp/php-build-scripts/compare/b479ec438f05459eac959f4952152527bbc7ce0b...af250d7e065ca4a1b8004d9e245a0f444846dde0) --- updated-dependencies: - dependency-name: build/php dependency-type: direct:production ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build/php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/php b/build/php index b479ec438..af250d7e0 160000 --- a/build/php +++ b/build/php @@ -1 +1 @@ -Subproject commit b479ec438f05459eac959f4952152527bbc7ce0b +Subproject commit af250d7e065ca4a1b8004d9e245a0f444846dde0 From ceea8220a9003898be814065199a72062248c8ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 13:23:48 +0000 Subject: [PATCH 05/13] Bump symfony/filesystem from 5.4.13 to 5.4.19 (#5530) Bumps [symfony/filesystem](https://github.com/symfony/filesystem) from 5.4.13 to 5.4.19. - [Release notes](https://github.com/symfony/filesystem/releases) - [Changelog](https://github.com/symfony/filesystem/blob/6.2/CHANGELOG.md) - [Commits](https://github.com/symfony/filesystem/compare/v5.4.13...v5.4.19) --- updated-dependencies: - dependency-name: symfony/filesystem dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index b23e4916d..0b528344c 100644 --- a/composer.lock +++ b/composer.lock @@ -1034,16 +1034,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.13", + "version": "v5.4.19", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "ac09569844a9109a5966b9438fc29113ce77cf51" + "reference": "648bfaca6a494f3e22378123bcee2894045dc9d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/ac09569844a9109a5966b9438fc29113ce77cf51", - "reference": "ac09569844a9109a5966b9438fc29113ce77cf51", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/648bfaca6a494f3e22378123bcee2894045dc9d8", + "reference": "648bfaca6a494f3e22378123bcee2894045dc9d8", "shasum": "" }, "require": { @@ -1078,7 +1078,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.13" + "source": "https://github.com/symfony/filesystem/tree/v5.4.19" }, "funding": [ { @@ -1094,7 +1094,7 @@ "type": "tidelift" } ], - "time": "2022-09-21T19:53:16+00:00" + "time": "2023-01-14T19:14:44+00:00" }, { "name": "symfony/polyfill-ctype", From b58d7fc82a8aecc45919f6cd15da256c1fe148f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 13:00:07 +0000 Subject: [PATCH 06/13] Bump build/php from `af250d7` to `83bec42` (#5534) Bumps [build/php](https://github.com/pmmp/php-build-scripts) from `af250d7` to `83bec42`. - [Release notes](https://github.com/pmmp/php-build-scripts/releases) - [Commits](https://github.com/pmmp/php-build-scripts/compare/af250d7e065ca4a1b8004d9e245a0f444846dde0...83bec42c3cdb7a9acf120596f555cb0748f429b4) --- updated-dependencies: - dependency-name: build/php dependency-type: direct:production ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build/php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/php b/build/php index af250d7e0..83bec42c3 160000 --- a/build/php +++ b/build/php @@ -1 +1 @@ -Subproject commit af250d7e065ca4a1b8004d9e245a0f444846dde0 +Subproject commit 83bec42c3cdb7a9acf120596f555cb0748f429b4 From 7eca3e808120465a9dcd7390d0c936b91dcfde20 Mon Sep 17 00:00:00 2001 From: zSALLAZAR Date: Wed, 25 Jan 2023 22:53:27 +0100 Subject: [PATCH 07/13] Fix typo closes #5533 --- src/MemoryManager.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MemoryManager.php b/src/MemoryManager.php index 0162f0be0..06ed0656d 100644 --- a/src/MemoryManager.php +++ b/src/MemoryManager.php @@ -71,7 +71,7 @@ use const SORT_NUMERIC; class MemoryManager{ private const DEFAULT_CHECK_RATE = Server::TARGET_TICKS_PER_SECOND; private const DEFAULT_CONTINUOUS_TRIGGER_RATE = Server::TARGET_TICKS_PER_SECOND * 2; - private const DEEFAULT_TICKS_PER_GC = 30 * 60 * Server::TARGET_TICKS_PER_SECOND; + private const DEFAULT_TICKS_PER_GC = 30 * 60 * Server::TARGET_TICKS_PER_SECOND; private int $memoryLimit; private int $globalMemoryLimit; @@ -139,7 +139,7 @@ class MemoryManager{ $this->continuousTrigger = $config->getPropertyBool("memory.continuous-trigger", true); $this->continuousTriggerRate = $config->getPropertyInt("memory.continuous-trigger-rate", self::DEFAULT_CONTINUOUS_TRIGGER_RATE); - $this->garbageCollectionPeriod = $config->getPropertyInt("memory.garbage-collection.period", self::DEEFAULT_TICKS_PER_GC); + $this->garbageCollectionPeriod = $config->getPropertyInt("memory.garbage-collection.period", self::DEFAULT_TICKS_PER_GC); $this->garbageCollectionTrigger = $config->getPropertyBool("memory.garbage-collection.low-memory-trigger", true); $this->garbageCollectionAsync = $config->getPropertyBool("memory.garbage-collection.collect-async-worker", true); From 00dbb6855a1a6e4dcfbe609b2b5eb2851ac0014c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Jan 2023 23:08:08 +0000 Subject: [PATCH 08/13] Bump build/php from `83bec42` to `1c44c61` (#5539) Bumps [build/php](https://github.com/pmmp/php-build-scripts) from `83bec42` to `1c44c61`. - [Release notes](https://github.com/pmmp/php-build-scripts/releases) - [Commits](https://github.com/pmmp/php-build-scripts/compare/83bec42c3cdb7a9acf120596f555cb0748f429b4...1c44c615c30b3ea2c4d8da93aa8dc96c1b56b47d) --- updated-dependencies: - dependency-name: build/php dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build/php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/php b/build/php index 83bec42c3..1c44c615c 160000 --- a/build/php +++ b/build/php @@ -1 +1 @@ -Subproject commit 83bec42c3cdb7a9acf120596f555cb0748f429b4 +Subproject commit 1c44c615c30b3ea2c4d8da93aa8dc96c1b56b47d From 7529953f0a334eaa9cabfa850e6c644b57340ee9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Jan 2023 23:08:36 +0000 Subject: [PATCH 09/13] Bump phpstan/phpstan from 1.9.13 to 1.9.14 (#5523) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.9.13 to 1.9.14. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.10.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.9.13...1.9.14) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 50593ee5b..9b1501ea3 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ "webmozart/path-util": "^2.3" }, "require-dev": { - "phpstan/phpstan": "1.9.13", + "phpstan/phpstan": "1.9.14", "phpstan/phpstan-phpunit": "^1.1.0", "phpstan/phpstan-strict-rules": "^1.2.0", "phpunit/phpunit": "^9.2" diff --git a/composer.lock b/composer.lock index 0b528344c..655fdba85 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": "15ba4659fe5eb8a99345c917325e90fd", + "content-hash": "8e2b03d128d6c14cf0f5e78d4bb7af90", "packages": [ { "name": "adhocore/json-comment", @@ -1832,16 +1832,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.9.13", + "version": "1.9.14", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "a0922426da3a7d0d9334e99a363f7f9f6e23e84f" + "reference": "e5fcc96289cf737304286a9b505fbed091f02e58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a0922426da3a7d0d9334e99a363f7f9f6e23e84f", - "reference": "a0922426da3a7d0d9334e99a363f7f9f6e23e84f", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e5fcc96289cf737304286a9b505fbed091f02e58", + "reference": "e5fcc96289cf737304286a9b505fbed091f02e58", "shasum": "" }, "require": { @@ -1871,7 +1871,7 @@ ], "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.9.13" + "source": "https://github.com/phpstan/phpstan/tree/1.9.14" }, "funding": [ { @@ -1887,7 +1887,7 @@ "type": "tidelift" } ], - "time": "2023-01-18T15:26:53+00:00" + "time": "2023-01-19T10:47:09+00:00" }, { "name": "phpstan/phpstan-phpunit", From fe12e8d944b244ffb1c20259631b30f3af37e9e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 12:39:14 +0000 Subject: [PATCH 10/13] Bump build/php from `1c44c61` to `c658506` (#5542) Bumps [build/php](https://github.com/pmmp/php-build-scripts) from `1c44c61` to `c658506`. - [Release notes](https://github.com/pmmp/php-build-scripts/releases) - [Commits](https://github.com/pmmp/php-build-scripts/compare/1c44c615c30b3ea2c4d8da93aa8dc96c1b56b47d...c6585061ca9b2f5aed7d030aae583fc3de9b2557) --- updated-dependencies: - dependency-name: build/php dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build/php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/php b/build/php index 1c44c615c..c6585061c 160000 --- a/build/php +++ b/build/php @@ -1 +1 @@ -Subproject commit 1c44c615c30b3ea2c4d8da93aa8dc96c1b56b47d +Subproject commit c6585061ca9b2f5aed7d030aae583fc3de9b2557 From 0ac9584bbb85b92208bb6565b156c8cf076ff4cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 12:49:42 +0000 Subject: [PATCH 11/13] Bump shivammathur/setup-php from 2.23.0 to 2.24.0 (#5543) Bumps [shivammathur/setup-php](https://github.com/shivammathur/setup-php) from 2.23.0 to 2.24.0. - [Release notes](https://github.com/shivammathur/setup-php/releases) - [Commits](https://github.com/shivammathur/setup-php/compare/2.23.0...2.24.0) --- updated-dependencies: - dependency-name: shivammathur/setup-php dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/discord-release-notify.yml | 2 +- .github/workflows/draft-release.yml | 2 +- .github/workflows/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/discord-release-notify.yml b/.github/workflows/discord-release-notify.yml index 595b7374a..91fb4c83e 100644 --- a/.github/workflows/discord-release-notify.yml +++ b/.github/workflows/discord-release-notify.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3 - name: Setup PHP and tools - uses: shivammathur/setup-php@2.23.0 + uses: shivammathur/setup-php@2.24.0 with: php-version: 8.0 diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 3d49656a8..0b7217a08 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -18,7 +18,7 @@ jobs: submodules: true - name: Setup PHP - uses: shivammathur/setup-php@2.23.0 + uses: shivammathur/setup-php@2.24.0 with: php-version: 8.0 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6e5d22e0b..ad9fc56ec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -201,7 +201,7 @@ jobs: - uses: actions/checkout@v3 - name: Setup PHP and tools - uses: shivammathur/setup-php@2.23.0 + uses: shivammathur/setup-php@2.24.0 with: php-version: 8.0 tools: php-cs-fixer:3.11 From 92c29b81722702306c2e728566d4112d38661e34 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 30 Jan 2023 12:53:06 +0000 Subject: [PATCH 12/13] Update transitive composer dependencies --- composer.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index 655fdba85..c0a3800fe 100644 --- a/composer.lock +++ b/composer.lock @@ -1665,16 +1665,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.2", + "version": "v4.15.3", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc" + "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039", + "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039", "shasum": "" }, "require": { @@ -1715,9 +1715,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3" }, - "time": "2022-11-12T15:38:23+00:00" + "time": "2023-01-16T22:05:37+00:00" }, { "name": "phar-io/manifest", @@ -1991,16 +1991,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.23", + "version": "9.2.24", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c" + "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", - "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2cf940ebc6355a9d430462811b5aaa308b174bed", + "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed", "shasum": "" }, "require": { @@ -2056,7 +2056,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.24" }, "funding": [ { @@ -2064,7 +2064,7 @@ "type": "github" } ], - "time": "2022-12-28T12:41:10+00:00" + "time": "2023-01-26T08:26:55+00:00" }, { "name": "phpunit/php-file-iterator", From 96c32d24ba48e77ff4c47649f309376a1fc213cc Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 30 Jan 2023 13:23:40 +0000 Subject: [PATCH 13/13] Update composer dependencies --- composer.json | 4 ++-- composer.lock | 28 ++++++++++++++-------------- src/lang/KnownTranslationFactory.php | 4 ++++ src/lang/KnownTranslationKeys.php | 1 + 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index a4a53a627..c4570bb09 100644 --- a/composer.json +++ b/composer.json @@ -35,13 +35,13 @@ "fgrosse/phpasn1": "^2.3", "netresearch/jsonmapper": "^4.0", "pocketmine/bedrock-data": "~1.13.0+bedrock-1.19.50", - "pocketmine/bedrock-protocol": "~18.0.0+bedrock-1.19.50", + "pocketmine/bedrock-protocol": "~18.1.0+bedrock-1.19.50", "pocketmine/binaryutils": "^0.2.1", "pocketmine/callback-validator": "^1.0.2", "pocketmine/classloader": "^0.2.0", "pocketmine/color": "^0.3.0", "pocketmine/errorhandler": "^0.6.0", - "pocketmine/locale-data": "~2.17.0", + "pocketmine/locale-data": "~2.18.0", "pocketmine/log": "^0.4.0", "pocketmine/log-pthreads": "^0.4.0", "pocketmine/math": "^0.4.0", diff --git a/composer.lock b/composer.lock index ef0bfa35f..e8987fccf 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": "0c1d23e60b8e9afc418cc45d5ee35b87", + "content-hash": "2c0f273b515174abfdcef4fc4ad3c262", "packages": [ { "name": "adhocore/json-comment", @@ -276,16 +276,16 @@ }, { "name": "pocketmine/bedrock-protocol", - "version": "18.0.0+bedrock-1.19.50", + "version": "18.1.0+bedrock-1.19.50", "source": { "type": "git", "url": "https://github.com/pmmp/BedrockProtocol.git", - "reference": "b558ec883bd967dd3339f513cba62d2fbcd63349" + "reference": "c34f22847a1cc362a3f1c45698576d30d1e8392f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/b558ec883bd967dd3339f513cba62d2fbcd63349", - "reference": "b558ec883bd967dd3339f513cba62d2fbcd63349", + "url": "https://api.github.com/repos/pmmp/BedrockProtocol/zipball/c34f22847a1cc362a3f1c45698576d30d1e8392f", + "reference": "c34f22847a1cc362a3f1c45698576d30d1e8392f", "shasum": "" }, "require": { @@ -299,7 +299,7 @@ "ramsey/uuid": "^4.1" }, "require-dev": { - "phpstan/phpstan": "1.9.4", + "phpstan/phpstan": "1.9.13", "phpstan/phpstan-phpunit": "^1.0.0", "phpstan/phpstan-strict-rules": "^1.0.0", "phpunit/phpunit": "^9.5" @@ -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/18.0.0+bedrock-1.19.50" + "source": "https://github.com/pmmp/BedrockProtocol/tree/18.1.0+bedrock-1.19.50" }, - "time": "2023-01-06T21:47:35+00:00" + "time": "2023-01-20T12:35:30+00:00" }, { "name": "pocketmine/binaryutils", @@ -537,16 +537,16 @@ }, { "name": "pocketmine/locale-data", - "version": "2.17.0", + "version": "2.18.3", "source": { "type": "git", "url": "https://github.com/pmmp/Language.git", - "reference": "a2c7071117c98ccc0e333994271cab1072eb3c06" + "reference": "da25bfe9ee4822a84feb9b7e620c56ad4000aed0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/Language/zipball/a2c7071117c98ccc0e333994271cab1072eb3c06", - "reference": "a2c7071117c98ccc0e333994271cab1072eb3c06", + "url": "https://api.github.com/repos/pmmp/Language/zipball/da25bfe9ee4822a84feb9b7e620c56ad4000aed0", + "reference": "da25bfe9ee4822a84feb9b7e620c56ad4000aed0", "shasum": "" }, "type": "library", @@ -554,9 +554,9 @@ "description": "Language resources used by PocketMine-MP", "support": { "issues": "https://github.com/pmmp/Language/issues", - "source": "https://github.com/pmmp/Language/tree/2.17.0" + "source": "https://github.com/pmmp/Language/tree/2.18.3" }, - "time": "2023-01-13T17:22:45+00:00" + "time": "2023-01-17T21:43:36+00:00" }, { "name": "pocketmine/log", diff --git a/src/lang/KnownTranslationFactory.php b/src/lang/KnownTranslationFactory.php index c114ae5de..07a8b17b4 100644 --- a/src/lang/KnownTranslationFactory.php +++ b/src/lang/KnownTranslationFactory.php @@ -1629,6 +1629,10 @@ final class KnownTranslationFactory{ return new Translatable(KnownTranslationKeys::POCKETMINE_DISCONNECT_ERROR_LOGINTIMEOUT, []); } + public static function pocketmine_disconnect_error_respawn() : Translatable{ + return new Translatable(KnownTranslationKeys::POCKETMINE_DISCONNECT_ERROR_RESPAWN, []); + } + public static function pocketmine_disconnect_incompatibleProtocol(Translatable|string $param0) : Translatable{ return new Translatable(KnownTranslationKeys::POCKETMINE_DISCONNECT_INCOMPATIBLEPROTOCOL, [ 0 => $param0, diff --git a/src/lang/KnownTranslationKeys.php b/src/lang/KnownTranslationKeys.php index 0dd623f60..3221ecbdc 100644 --- a/src/lang/KnownTranslationKeys.php +++ b/src/lang/KnownTranslationKeys.php @@ -354,6 +354,7 @@ final class KnownTranslationKeys{ public const POCKETMINE_DISCONNECT_ERROR_BADPACKET = "pocketmine.disconnect.error.badPacket"; public const POCKETMINE_DISCONNECT_ERROR_INTERNAL = "pocketmine.disconnect.error.internal"; public const POCKETMINE_DISCONNECT_ERROR_LOGINTIMEOUT = "pocketmine.disconnect.error.loginTimeout"; + public const POCKETMINE_DISCONNECT_ERROR_RESPAWN = "pocketmine.disconnect.error.respawn"; public const POCKETMINE_DISCONNECT_INCOMPATIBLEPROTOCOL = "pocketmine.disconnect.incompatibleProtocol"; public const POCKETMINE_DISCONNECT_INVALIDSESSION = "pocketmine.disconnect.invalidSession"; public const POCKETMINE_DISCONNECT_INVALIDSESSION_BADSIGNATURE = "pocketmine.disconnect.invalidSession.badSignature";