Merge branch 'staging/4.1' into next-minor

src/block/BambooSapling.php

@@ -36,14 +36,14 @@ final class BambooSapling extends Flowable{
 	private bool $ready = false;
 
 	public function readStateFromData(int $id, int $stateMeta) : void{
-		$this->ready = ($stateMeta & BlockLegacyMetadata::SAPLING_FLAG_READY) !== 0;
+		$this->ready = ($stateMeta & BlockLegacyMetadata::BAMBOO_SAPLING_FLAG_READY) !== 0;
 	}
 
 	protected function writeStateToMeta() : int{
-		return $this->ready ? BlockLegacyMetadata::SAPLING_FLAG_READY : 0;
+		return $this->ready ? BlockLegacyMetadata::BAMBOO_SAPLING_FLAG_READY : 0;
 	}
 
-	public function getStateBitmask() : int{ return 0b1000; }
+	public function getStateBitmask() : int{ return 0b1; }
 
 	public function isReady() : bool{ return $this->ready; }
 

src/block/BlockLegacyMetadata.php

@@ -42,6 +42,8 @@ final class BlockLegacyMetadata{
 	public const BAMBOO_LEAF_SIZE_SHIFT = 1;
 	public const BAMBOO_LEAF_SIZE_MASK = 0x03;
 
+	public const BAMBOO_SAPLING_FLAG_READY = 0x01;
+
 	public const BARREL_FLAG_OPEN = 0x08;
 
 	public const BED_FLAG_HEAD = 0x08;

src/block/StainedGlass.php

@@ -24,7 +24,13 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\ColorInMetadataTrait;
+use pocketmine\block\utils\DyeColor;
 
 final class StainedGlass extends Glass{
 	use ColorInMetadataTrait;
+
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
+		$this->color = DyeColor::WHITE();
+		parent::__construct($idInfo, $name, $breakInfo);
+	}
 }

src/block/StainedGlassPane.php

@@ -24,7 +24,13 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\ColorInMetadataTrait;
+use pocketmine\block\utils\DyeColor;
 
 final class StainedGlassPane extends GlassPane{
 	use ColorInMetadataTrait;
+
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
+		$this->color = DyeColor::WHITE();
+		parent::__construct($idInfo, $name, $breakInfo);
+	}
 }

src/block/StainedHardenedClay.php

@@ -24,7 +24,13 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\ColorInMetadataTrait;
+use pocketmine\block\utils\DyeColor;
 
 final class StainedHardenedClay extends HardenedClay{
 	use ColorInMetadataTrait;
+
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
+		$this->color = DyeColor::WHITE();
+		parent::__construct($idInfo, $name, $breakInfo);
+	}
 }

src/block/StainedHardenedGlass.php

@@ -24,7 +24,13 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\ColorInMetadataTrait;
+use pocketmine\block\utils\DyeColor;
 
 final class StainedHardenedGlass extends HardenedGlass{
 	use ColorInMetadataTrait;
+
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
+		$this->color = DyeColor::WHITE();
+		parent::__construct($idInfo, $name, $breakInfo);
+	}
 }

src/block/StainedHardenedGlassPane.php

@@ -24,7 +24,13 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\ColorInMetadataTrait;
+use pocketmine\block\utils\DyeColor;
 
 final class StainedHardenedGlassPane extends HardenedGlassPane{
 	use ColorInMetadataTrait;
+
+	public function __construct(BlockIdentifier $idInfo, string $name, BlockBreakInfo $breakInfo){
+		$this->color = DyeColor::WHITE();
+		parent::__construct($idInfo, $name, $breakInfo);
+	}
 }