diff --git a/composer.json b/composer.json
index 70727ce63..4bd3a7f46 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": "dev-array-in-string-property-error as 4.2.0",
+      "pocketmine/netresearch-jsonmapper": "~v4.2.999",
       "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,11 +93,5 @@
       "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 7f675943c..afda5bba1 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": "6982184bc024b09473e58578eb7ee8bf",
+    "content-hash": "cae150ae8bac086e74a390a96ad48ac4",
     "packages": [
         {
             "name": "adhocore/json-comment",
@@ -196,56 +196,6 @@
             "abandoned": true,
             "time": "2022-12-19T11:08:26+00:00"
         },
-        {
-            "name": "netresearch/jsonmapper",
-            "version": "dev-array-in-string-property-error",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/dktapps/jsonmapper.git",
-                "reference": "4a82d1b98b99d682b660d6caa9b3816b2abc794c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/dktapps/jsonmapper/zipball/4a82d1b98b99d682b660d6caa9b3816b2abc794c",
-                "reference": "4a82d1b98b99d682b660d6caa9b3816b2abc794c",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0",
-                "squizlabs/php_codesniffer": "~3.5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "JsonMapper": "src/"
-                }
-            },
-            "license": [
-                "OSL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Weiske",
-                    "email": "cweiske@cweiske.de",
-                    "homepage": "http://github.com/cweiske/jsonmapper/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Map nested JSON structures onto PHP classes",
-            "support": {
-                "email": "cweiske@cweiske.de",
-                "issues": "https://github.com/cweiske/jsonmapper/issues",
-                "source": "https://github.com/dktapps/jsonmapper/tree/array-in-string-property-error"
-            },
-            "time": "2023-05-30T13:10:31+00:00"
-        },
         {
             "name": "pocketmine/bedrock-block-upgrade-schema",
             "version": "2.1.0",
@@ -778,6 +728,60 @@
             },
             "time": "2023-04-10T11:31:20+00:00"
         },
+        {
+            "name": "pocketmine/netresearch-jsonmapper",
+            "version": "v4.2.999",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/netresearch-jsonmapper.git",
+                "reference": "f700806dec756ed825a8200dc2950ead98265956"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/netresearch-jsonmapper/zipball/f700806dec756ed825a8200dc2950ead98265956",
+                "reference": "f700806dec756ed825a8200dc2950ead98265956",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=7.1"
+            },
+            "replace": {
+                "netresearch/jsonmapper": "~4.2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0",
+                "squizlabs/php_codesniffer": "~3.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "JsonMapper": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "OSL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Weiske",
+                    "email": "cweiske@cweiske.de",
+                    "homepage": "http://github.com/cweiske/jsonmapper/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Fork of netresearch/jsonmapper with security fixes needed by pocketmine/pocketmine-mp",
+            "support": {
+                "email": "cweiske@cweiske.de",
+                "issues": "https://github.com/cweiske/jsonmapper/issues",
+                "source": "https://github.com/pmmp/netresearch-jsonmapper/tree/v4.2.999"
+            },
+            "time": "2023-06-01T13:43:01+00:00"
+        },
         {
             "name": "pocketmine/raklib",
             "version": "0.14.6",
@@ -3277,18 +3281,9 @@
             "time": "2021-07-28T10:34:58+00:00"
         }
     ],
-    "aliases": [
-        {
-            "package": "netresearch/jsonmapper",
-            "version": "dev-array-in-string-property-error",
-            "alias": "4.2.0",
-            "alias_normalized": "4.2.0.0"
-        }
-    ],
+    "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "netresearch/jsonmapper": 20
-    },
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {