Merge branch 'stable' into master

# Conflicts:
#	build/make-release.php
#	composer.lock
#	resources/vanilla
#	src/plugin/PluginDescription.php
#	src/pocketmine/entity/Human.php
This commit is contained in:
Dylan K. Taylor
2020-10-21 16:55:52 +01:00
6 changed files with 37 additions and 23 deletions

View File

@ -25,6 +25,7 @@ namespace pocketmine\entity\utils;
use pocketmine\math\Math;
use pocketmine\utils\AssumptionFailedError;
use function count;
use function max;
abstract class ExperienceUtils{