Merge commit '42e14f749'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
#	src/pocketmine/item/Bow.php
#	src/world/World.php
This commit is contained in:
Dylan K. Taylor
2020-06-03 12:31:17 +01:00
4 changed files with 13 additions and 10 deletions

View File

@ -80,7 +80,7 @@ class Bow extends Tool{
}
$ev = new EntityShootBowEvent($player, $this, $entity, $baseForce * 3);
if($baseForce < 0.1 or $diff < 5){
if($baseForce < 0.1 or $diff < 5 or $player->isSpectator()){
$ev->setCancelled();
}