Merge branch 'stable' into next-minor

# Conflicts:
#	src/pocketmine/Player.php
#	src/pocketmine/block/SnowLayer.php
This commit is contained in:
Dylan K. Taylor
2020-06-01 13:42:59 +01:00
15 changed files with 93 additions and 38 deletions

View File

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