Merge commit '9d26a224a'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/block/DoublePlant.php
This commit is contained in:
Dylan K. Taylor 2020-06-03 12:35:59 +01:00
commit d7ae86b30c

View File

@ -92,4 +92,12 @@ class DoublePlant extends Flowable{
return parent::getAffectedBlocks(); return parent::getAffectedBlocks();
} }
public function getFlameEncouragement() : int{
return 60;
}
public function getFlammability() : int{
return 100;
}
} }