diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index b1fb36c2d..d078a7acf 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -18,6 +18,12 @@ parameters:
 			count: 1
 			path: src/pocketmine/Server.php
 
+		-
+			message: "#^Call to an undefined method pocketmine\\\\command\\\\CommandSender\\:\\:teleport\\(\\)\\.$#"
+			count: 1
+			path: src/pocketmine/command/defaults/TeleportCommand.php
+#			comment: "not actually possible, but high cost to fix warning"
+
 		-
 			message: "#^Constructor of class pocketmine\\\\level\\\\generator\\\\hell\\\\Nether has an unused parameter \\$options\\.$#"
 			count: 1
@@ -40,38 +46,33 @@ parameters:
 
 		-
 			message: "#^Constant pocketmine\\\\COMPOSER_AUTOLOADER_PATH not found\\.$#"
-			path: src/pocketmine
+			path: src
 
 		-
 			message: "#^Constant pocketmine\\\\DATA not found\\.$#"
-			path: src/pocketmine
+			path: src
 
 		-
 			message: "#^Constant pocketmine\\\\GIT_COMMIT not found\\.$#"
-			path: src/pocketmine
+			path: src
 
 		-
 			message: "#^Constant pocketmine\\\\PATH not found\\.$#"
-			path: src/pocketmine
+			path: src
 
 		-
 			message: "#^Constant pocketmine\\\\PLUGIN_PATH not found\\.$#"
-			path: src/pocketmine
+			path: src
 
 		-
 			message: "#^Constant pocketmine\\\\RESOURCE_PATH not found\\.$#"
-			path: src/pocketmine
+			path: src
 
 		-
 			message: "#^Constant pocketmine\\\\START_TIME not found\\.$#"
-			path: src/pocketmine
+			path: src
 
 		-
 			message: "#^Constant pocketmine\\\\VERSION not found\\.$#"
-			path: src/pocketmine
+			path: src
 
-		-
-			message: "#^Call to an undefined method pocketmine\\\\command\\\\CommandSender\\:\\:teleport\\(\\)\\.$#"
-			count: 1
-			path: src/pocketmine/command/defaults/TeleportCommand.php
-#			comment: "not actually possible, but high cost to fix warning"
diff --git a/tests/phpstan/configs/phpstan-bugs.neon b/tests/phpstan/configs/phpstan-bugs.neon
index d6503d71f..1f7c01b9c 100644
--- a/tests/phpstan/configs/phpstan-bugs.neon
+++ b/tests/phpstan/configs/phpstan-bugs.neon
@@ -2,9 +2,17 @@ parameters:
 	ignoreErrors:
 		-
 			message: "#^PHPDoc tag @param has invalid value \\(.+\\)\\: Unexpected token \"&\", expected variable at offset \\d+$#"
-			path: ../../../src/pocketmine
+			path: ../../../src
 
 		-
 			message: "#^Default value of the parameter \\#\\d+ \\$[A-Za-z\\d_]+ \\(\\-?\\d+\\) of method .+\\(\\) is incompatible with type float\\.$#"
-			path: ../../../src/pocketmine
+			path: ../../../src
+
+		-
+			message: "#^Cannot access an offset on Threaded\\.$#"
+			path: ../../../src
+
+		-
+			message: "#^Cannot assign new offset to Threaded\\.$#"
+			path: ../../../src