Merge commit 'a67d2ae978ecae234c3e46b5ac0f8f0dc99e85a7'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/item/Bow.php
This commit is contained in:
Dylan K. Taylor 2020-05-19 21:15:56 +01:00
commit 5b82bd4fad

View File

@ -57,7 +57,6 @@ class Bow extends Tool{
($location->yaw > 180 ? 360 : 0) - $location->yaw,
-$location->pitch
);
$nbt->setShort("Fire", $player->isOnFire() ? 45 * 60 : 0);
$diff = $player->getItemUseDuration();
$p = $diff / 20;