From 2f2ffe0aa4a8e2fbb5cf86e32110a1f83d4fd3af Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Fri, 13 May 2022 21:03:49 +0100
Subject: [PATCH] fix phpstan

---
 .../bedrock/blockstate/upgrade/BlockStateUpgradeSchema.php     | 2 --
 .../data/bedrock/blockstate/upgrade/BlockStateUpgraderTest.php | 2 +-
 tools/generate-blockstate-upgrade-schema.php                   | 3 ++-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchema.php b/src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchema.php
index 7f7fac1ec..75e50a52e 100644
--- a/src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchema.php
+++ b/src/data/bedrock/blockstate/upgrade/BlockStateUpgradeSchema.php
@@ -64,8 +64,6 @@ final class BlockStateUpgradeSchema{
 	 */
 	public array $remappedStates = [];
 
-	private ?bool $backwardsCompatible = null;
-
 	public function __construct(
 		public int $maxVersionMajor,
 		public int $maxVersionMinor,
diff --git a/tests/phpunit/data/bedrock/blockstate/upgrade/BlockStateUpgraderTest.php b/tests/phpunit/data/bedrock/blockstate/upgrade/BlockStateUpgraderTest.php
index 9decc4d88..bddda744f 100644
--- a/tests/phpunit/data/bedrock/blockstate/upgrade/BlockStateUpgraderTest.php
+++ b/tests/phpunit/data/bedrock/blockstate/upgrade/BlockStateUpgraderTest.php
@@ -52,7 +52,7 @@ class BlockStateUpgraderTest extends TestCase{
 	}
 
 	private function getNewSchemaVersion(int $versionId) : BlockStateUpgradeSchema{
-		$schema = new BlockStateUpgradeSchema(($versionId >> 24) & 0xff, ($versionId >> 16) & 0xff, ($versionId >> 8) & 0xff, $versionId & 0xff);
+		$schema = new BlockStateUpgradeSchema(($versionId >> 24) & 0xff, ($versionId >> 16) & 0xff, ($versionId >> 8) & 0xff, $versionId & 0xff, 0);
 		$this->upgrader->addSchema($schema);
 		return $schema;
 	}
diff --git a/tools/generate-blockstate-upgrade-schema.php b/tools/generate-blockstate-upgrade-schema.php
index 54e773e22..e8e0a7988 100644
--- a/tools/generate-blockstate-upgrade-schema.php
+++ b/tools/generate-blockstate-upgrade-schema.php
@@ -208,7 +208,8 @@ function generateBlockStateUpgradeSchema(array $upgradeTable) : BlockStateUpgrad
 		($foundVersion >> 24) & 0xff,
 		($foundVersion >> 16) & 0xff,
 		($foundVersion >> 8) & 0xff,
-		($foundVersion & 0xff)
+		($foundVersion & 0xff),
+		0
 	);
 	foreach(Utils::stringifyKeys($upgradeTable) as $oldName => $blockStateMappings){
 		$newNameFound = [];