From 76749cbaa742151cca838156f50baca5e2eb55c3 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Tue, 30 May 2023 14:30:28 +0100
Subject: [PATCH 1/2] Use fork of JsonMapper to solve cweiske/jsonmapper#210

---
 composer.json | 10 ++++++++--
 composer.lock | 30 +++++++++++++++++++-----------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/composer.json b/composer.json
index 7650b7f36..be734bea4 100644
--- a/composer.json
+++ b/composer.json
@@ -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"
+      }
+   ]
 }
diff --git a/composer.lock b/composer.lock
index bad0235cb..c7fff9bcc 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": "7ca2d4ed0987ac17cf615d67945f5687",
+    "content-hash": "80cc5ebf379cf4f425bf98e10611713e",
     "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",
@@ -3480,9 +3479,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": {

From e7bdaa8579889243e236a98af5fdb5240486222d Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Tue, 30 May 2023 14:35:17 +0100
Subject: [PATCH 2/2] Release 4.20.5

---
 changelogs/4.20.md  | 6 ++++++
 src/VersionInfo.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changelogs/4.20.md b/changelogs/4.20.md
index 37a0ef37b..c767b8220 100644
--- a/changelogs/4.20.md
+++ b/changelogs/4.20.md
@@ -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).
diff --git a/src/VersionInfo.php b/src/VersionInfo.php
index 60013af1b..389ab0e2d 100644
--- a/src/VersionInfo.php
+++ b/src/VersionInfo.php
@@ -31,7 +31,7 @@ use function str_repeat;
 
 final class VersionInfo{
 	public const NAME = "PocketMine-MP";
-	public const BASE_VERSION = "4.20.4";
+	public const BASE_VERSION = "4.20.5";
 	public const IS_DEVELOPMENT_BUILD = false;
 	public const BUILD_CHANNEL = "stable";