Merge branch 'stable'

# Conflicts:
#	resources/vanilla
#	src/event/player/PlayerChatEvent.php
This commit is contained in:
Dylan K. Taylor 2020-07-21 19:28:00 +01:00
commit e3dce1f8bd

View File

@ -30,7 +30,6 @@ use pocketmine\permission\PermissionManager;
use pocketmine\player\Player;
use pocketmine\Server;
use pocketmine\utils\Utils;
use function array_values;
use function spl_object_id;
/**