Merge branch 'stable' into minor-next

This commit is contained in:
Dylan K. Taylor 2023-09-08 17:20:45 +01:00
commit f7f5af607c
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D

View File

@ -52,16 +52,19 @@ class DeadBush extends Flowable{
private function canBeSupportedAt(Block $block) : bool{ private function canBeSupportedAt(Block $block) : bool{
$supportBlock = $block->getSide(Facing::DOWN); $supportBlock = $block->getSide(Facing::DOWN);
//TODO: can we use tags here? return
return match($supportBlock->getTypeId()){ $supportBlock->hasTypeTag(BlockTypeTags::SAND) ||
BlockTypeIds::SAND, $supportBlock->hasTypeTag(BlockTypeTags::MUD) ||
BlockTypeIds::RED_SAND, match($supportBlock->getTypeId()){
BlockTypeIds::PODZOL, //can't use DIRT tag here because it includes farmland
BlockTypeIds::MYCELIUM, BlockTypeIds::PODZOL,
BlockTypeIds::DIRT, BlockTypeIds::MYCELIUM,
BlockTypeIds::HARDENED_CLAY, BlockTypeIds::DIRT,
BlockTypeIds::STAINED_CLAY => true, BlockTypeIds::GRASS,
default => false BlockTypeIds::HARDENED_CLAY,
}; BlockTypeIds::STAINED_CLAY => true,
//TODO: moss block
default => false,
};
} }
} }