Patch 4

.github/workflows/branch-sync-cron-trigger.yml

@@ -0,0 +1,32 @@
+#Since GitHub automatically disables cron actions after 60 days of repo inactivity, we need the active repo (PM)
+#to trigger the branch merge workflow explicitly. This avoids the need for TOS-violating actions which we previously
+#used to keep the restricted action active, as the workflow depends on the activity of this repo anyway.
+
+name: Trigger branch sync
+
+on:
+  schedule:
+    - cron: "0 0 * * *" #once per day so we don't spam merge commits on busy days
+  workflow_dispatch: #for testing
+
+jobs:
+  trigger:
+    name: Trigger branch sync RestrictedActions workflow
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Generate access token
+        id: generate-token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ vars.RESTRICTED_ACTIONS_DISPATCH_ID }}
+          private-key: ${{ secrets.RESTRICTED_ACTIONS_DISPATCH_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: RestrictedActions
+
+      - name: Dispatch branch sync restricted action
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          repository: ${{ github.repository_owner }}/RestrictedActions
+          event-type: pocketmine_mp_branch_sync

.github/workflows/build-docker-image.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   build:
     name: Update Docker Hub images
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Set up Docker Buildx
@@ -53,7 +53,7 @@ jobs:
         run: echo NAME=$(echo "${GITHUB_REPOSITORY,,}") >> $GITHUB_OUTPUT
 
       - name: Build image for tag
-        uses: docker/build-push-action@v6.15.0
+        uses: docker/build-push-action@v6.18.0
         with:
           push: true
           context: ./pocketmine-mp
@@ -66,7 +66,7 @@ jobs:
 
       - name: Build image for major tag
         if: steps.channel.outputs.CHANNEL == 'stable'
-        uses: docker/build-push-action@v6.15.0
+        uses: docker/build-push-action@v6.18.0
         with:
           push: true
           context: ./pocketmine-mp
@@ -79,7 +79,7 @@ jobs:
 
       - name: Build image for minor tag
         if: steps.channel.outputs.CHANNEL == 'stable'
-        uses: docker/build-push-action@v6.15.0
+        uses: docker/build-push-action@v6.18.0
         with:
           push: true
           context: ./pocketmine-mp
@@ -92,7 +92,7 @@ jobs:
 
       - name: Build image for latest tag
         if: steps.channel.outputs.CHANNEL == 'stable'
-        uses: docker/build-push-action@v6.15.0
+        uses: docker/build-push-action@v6.18.0
         with:
           push: true
           context: ./pocketmine-mp

.github/workflows/discord-release-notify.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup PHP and tools
-        uses: shivammathur/setup-php@2.32.0
+        uses: shivammathur/setup-php@2.33.0
         with:
           php-version: 8.2
 

.github/workflows/draft-release-pr-check.yml

@@ -24,7 +24,7 @@ permissions:
 jobs:
   check-intent:
     name: Check release trigger
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     outputs:
       valid: ${{ steps.validate.outputs.DEV_BUILD == 'false' }}
@@ -43,13 +43,13 @@ jobs:
     #don't do these checks if this isn't a release - we don't want to generate unnecessary failed statuses
     if: needs.check-intent.outputs.valid == 'true'
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.32.0
+        uses: shivammathur/setup-php@2.33.0
         with:
           php-version: 8.2
 

.github/workflows/draft-release.yml

@@ -23,7 +23,7 @@ env:
 jobs:
   skip:
     name: Check whether to ignore this tag
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     outputs:
       skip: ${{ steps.exists.outputs.exists == 'true' }}
@@ -54,12 +54,12 @@ jobs:
     needs: [check]
     if: needs.check.outputs.valid == 'true' && github.ref_type != 'tag' #can't do post-commit for a tag
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Generate access token
         id: generate-token
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@v2
         with:
           app-id: ${{ vars.RESTRICTED_ACTIONS_DISPATCH_ID }}
           private-key: ${{ secrets.RESTRICTED_ACTIONS_DISPATCH_KEY }}
@@ -79,15 +79,15 @@ jobs:
     needs: [check]
     if: needs.check.outputs.valid == 'true' || github.ref_type == 'tag' #ignore validity check for tags
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.32.0
+        uses: shivammathur/setup-php@2.33.0
         with:
           php-version: ${{ env.PHP_VERSION }}
 

.github/workflows/main-php-matrix.yml

@@ -15,7 +15,7 @@ on:
         type: number
       image:
         description: 'Runner image to use'
-        default: 'ubuntu-20.04'
+        default: 'ubuntu-22.04'
         type: string
 
 jobs:

.github/workflows/main.yml

@@ -20,18 +20,18 @@ jobs:
 
   codestyle:
     name: Code Style checks
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Setup PHP and tools
-        uses: shivammathur/setup-php@2.32.0
+        uses: shivammathur/setup-php@2.33.0
         with:
-          php-version: 8.2
-          tools: php-cs-fixer:3.49
+          php-version: 8.3
+          tools: php-cs-fixer:3.75
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -40,7 +40,7 @@ jobs:
 
   shellcheck:
     name: ShellCheck
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
 

.github/workflows/pr-remove-waiting-label.yml

@@ -15,19 +15,23 @@ jobs:
         with:
           github-token: ${{ github.token }}
           script: |
-            const [owner, repo] = context.payload.repository.full_name.split('/');
-            try {
-              await github.rest.issues.removeLabel({
-                owner: owner,
-                repo: repo,
-                issue_number: context.payload.number,
-                name: "Status: Waiting on Author",
-              });
-            } catch (error) {
-              if (error.status === 404) {
-                //probably label wasn't set on the issue
-                console.log('Failed to remove label (probably label isn\'t on the PR): ' + error.message);
-              } else {
-                throw error;
+            async function removeLabel(owner, repo, issue_number, name) {
+              try {
+                await github.rest.issues.removeLabel({
+                  owner: owner,
+                  repo: repo,
+                  issue_number: issue_number,
+                  name: name,
+                });
+              } catch (error) {
+                if (error.status === 404) {
+                  //probably label wasn't set on the issue
+                  console.log('Failed to remove label ' + name + ' (probably label isn\'t on the PR): ' + error.message);
+                } else {
+                  throw error;
+                }
               }
             }
+            const [owner, repo] = context.payload.repository.full_name.split('/');
+            removeLabel(owner, repo, context.payload.number, "Status: Waiting on Author");
+            removeLabel(owner, repo, context.payload.number, "Stale");

.github/workflows/team-pr-auto-approve.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       - name: Generate access token
         id: generate-token
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@v2
         with:
           app-id: ${{ vars.RESTRICTED_ACTIONS_DISPATCH_ID }}
           private-key: ${{ secrets.RESTRICTED_ACTIONS_DISPATCH_KEY }}

.php-cs-fixer.php

@@ -6,6 +6,12 @@
 	->in(__DIR__ . '/tests')
 	->in(__DIR__ . '/tools')
 	->notPath('plugins/DevTools')
+	//JsonMapper will break if the FQNs in the doc comments for these are shortened :(
+	->notPath('crafting/json')
+	->notPath('inventory/json')
+	->notPath('data/bedrock/block/upgrade/model')
+	->notPath('data/bedrock/item/upgrade/model')
+
 	->notName('PocketMine.php');
 
 return (new PhpCsFixer\Config)

build/dump-version-info.php

@@ -31,8 +31,8 @@
  */
 
 /**
- * @var string[]|\Closure[] $options
- * @phpstan-var array<string, string|\Closure() : string> $options
+ * @var string[]|Closure[] $options
+ * @phpstan-var array<string, string|Closure() : string> $options
  */
 $options = [
 	"base_version" => VersionInfo::BASE_VERSION,

changelogs/5.27.md

@@ -16,3 +16,9 @@ If you're upgrading from 5.25.x directly to 5.27.0, please also read the followi
 ## General
 - Aded support for Minecraft: Bedrock Edition 1.21.70.
 - Removed support for earlier versions.
+
+# 5.27.1
+Released 6th April 2025.
+
+## Fixes
+- Updated RakLib to get ping timestamp handling fixes.

changelogs/5.28.md

@@ -0,0 +1,34 @@
+# 5.28.0
+Released 9th May 2025.
+
+This is a support release for Minecraft: Bedrock Edition 1.21.80.
+
+**Plugin compatibility:** Plugins for previous 5.x versions will run unchanged on this release, unless they use internal APIs, reflection, or packages like the `pocketmine\network\mcpe` or `pocketmine\data` namespace.
+Do not update plugin minimum API versions unless you need new features added in this release.
+
+**WARNING: If your plugin uses the `pocketmine\network\mcpe` namespace, you're not shielded by API change constraints.**
+Consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you're using packets directly.
+
+## General
+- Added support for Minecraft: Bedrock Edition 1.21.80.
+- Removed support for earlier versions.
+
+## Fixes
+- `AvailableEnchantmentRegistry` now requires provided tags to always be `string`. Previously, this wasn't enforced, leading to random crashes in core code related to enchanting.
+- `Entity->setFireTicks()` and `Entity->setOnFire()` now truncate the fire time to the max value instead of throwing exceptions.
+
+## Internals
+- Improved PHPStan error reporting for unsafe foreaches. Foreach on an array with implicit keys now generates different errors than foreach on an array with string keys.
+
+# 5.28.1
+Released 17th May 2025.
+
+## Fixes
+- Fixed errors when PlayStation players attempt to join due to null `TitleID`.
+
+# 5.28.2
+Released 17th May 2025.
+
+## Fixes
+- Fixed version constraints which were incorrectly updated during the 1.21.80 update. This led to an unnoticed failure to update BedrockProtocol in the previous patch release.
+- Actually fixed PlayStation issues this time

composer.json

@@ -34,9 +34,9 @@
       "adhocore/json-comment": "~1.2.0",
       "netresearch/jsonmapper": "~v5.0.0",
       "pocketmine/bedrock-block-upgrade-schema": "~5.1.0+bedrock-1.21.60",
-      "pocketmine/bedrock-data": "~4.1.0+bedrock-1.21.70",
+      "pocketmine/bedrock-data": "~5.0.0+bedrock-1.21.80",
       "pocketmine/bedrock-item-upgrade-schema": "~1.14.0+bedrock-1.21.50",
-      "pocketmine/bedrock-protocol": "~37.0.0+bedrock-1.21.70",
+      "pocketmine/bedrock-protocol": "~38.1.0+bedrock-1.21.80",
       "pocketmine/binaryutils": "^0.2.1",
       "pocketmine/callback-validator": "^1.0.2",
       "pocketmine/color": "^0.3.0",
@@ -45,18 +45,22 @@
       "pocketmine/log": "^0.4.0",
       "pocketmine/math": "~1.0.0",
       "pocketmine/nbt": "~1.1.0",
-      "pocketmine/raklib": "~1.1.0",
+      "pocketmine/raklib": "~1.1.2",
       "pocketmine/raklib-ipc": "~1.0.0",
       "pocketmine/snooze": "^0.5.0",
       "ramsey/uuid": "~4.7.0",
       "symfony/filesystem": "~6.4.0"
    },
    "require-dev": {
-      "phpstan/phpstan": "2.1.8",
+      "phpstan/phpstan": "2.1.16",
       "phpstan/phpstan-phpunit": "^2.0.0",
       "phpstan/phpstan-strict-rules": "^2.0.0",
       "phpunit/phpunit": "^10.5.24"
    },
+   "replace": {
+      "symfony/polyfill-ctype": "*",
+      "symfony/polyfill-mbstring": "*"
+   },
    "autoload": {
       "psr-4": {
          "pocketmine\\": "src/"