mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-11 00:09:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5'

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-01-15 14:46:03 +00:00
commit c34a4f45d4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/item/Bow.php
View File

@ -63,10 +63,10 @@ class Bow extends Tool{
$diff = $player->getItemUseDuration(); $diff = $player->getItemUseDuration();
$p = $diff / 20; $p = $diff / 20;
$force = min((($p ** 2) + $p * 2) / 3, 1) * 2; $baseForce = min((($p ** 2) + $p * 2) / 3, 1);
/** @var ArrowEntity $entity */ /** @var ArrowEntity $entity */
$entity = EntityFactory::create(ArrowEntity::class, $player->getLevel(), $nbt, $player, $force == 2); $entity = EntityFactory::create(ArrowEntity::class, $player->getLevel(), $nbt, $player, $baseForce >= 1);
$infinity = $this->hasEnchantment(Enchantment::INFINITY); $infinity = $this->hasEnchantment(Enchantment::INFINITY);
if($infinity){ if($infinity){
@ -81,9 +81,9 @@ class Bow extends Tool{
if($this->hasEnchantment(Enchantment::FLAME)){ if($this->hasEnchantment(Enchantment::FLAME)){
$entity->setOnFire(intdiv($entity->getFireTicks(), 20) + 100); $entity->setOnFire(intdiv($entity->getFireTicks(), 20) + 100);
} }
$ev = new EntityShootBowEvent($player, $this, $entity, $force); $ev = new EntityShootBowEvent($player, $this, $entity, $baseForce * 3);
if($force < 0.1 or $diff < 5){ if($baseForce < 0.1 or $diff < 5){
$ev->setCancelled(); $ev->setCancelled();
} }