Added EntityShootBowEvent, made bow require an arrow

src/pocketmine/Player.php

@@ -31,6 +31,7 @@ use pocketmine\entity\Living;
 use pocketmine\event\block\SignChangeEvent;
 use pocketmine\event\entity\EntityDamageByEntityEvent;
 use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\event\entity\EntityShootBowEventEvent;
 use pocketmine\event\inventory\InventoryCloseEvent;
 use pocketmine\event\inventory\InventoryPickupItemEvent;
 use pocketmine\event\player\PlayerAchievementAwardedEvent;
@@ -1532,6 +1533,13 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 					case 5: //Shot arrow
 						//if($this->entity->inAction === true){
 						if($this->inventory->getItemInHand()->getID() === Item::BOW){
+							if(($this->gamemode & 0x01) === 0){
+								if(!$this->inventory->contains(Item::get(Item::ARROW, 0, 1))){
+									$this->inventory->sendContents($this);
+									return;
+								}
+							}
+
 							$f = 1.5;
 							$nbt = new Compound("", [
 								"Pos" => new Enum("Pos", [
@@ -1550,7 +1558,19 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 									]),
 							]);
 							$arrow = new Arrow($this->chunk, $nbt, $this);
-							$arrow->spawnToAll();
+
+							$ev = new EntityShootBowEventEvent($this, $this->inventory->getItemInHand(), $arrow, $f);
+
+							$this->server->getPluginManager()->callEvent($ev);
+
+							if($ev->isCancelled()){
+								$arrow->kill();
+							}else{
+								if(($this->gamemode & 0x01) === 0){
+									$this->inventory->removeItem(Item::get(Item::ARROW, 0, 1));
+								}
+								$arrow->spawnToAll();
+							}
 						}
 						//}
 						$this->startAction = false;

src/pocketmine/event/entity/EntityShootBowEvent.php

@@ -0,0 +1,82 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link   http://www.pocketmine.net/
+ *
+ *
+ */
+
+namespace pocketmine\event\entity;
+
+use pocketmine\entity\Living;
+use pocketmine\entity\Projectile;
+use pocketmine\event\Cancellable;
+use pocketmine\item\Bow;
+use pocketmine\item\Item;
+
+class EntityShootBowEventEvent extends EntityEvent implements Cancellable{
+	public static $handlerList = null;
+
+	/** @var Bow */
+	private $bow;
+	/** @var Projectile */
+	private $projectile;
+	/** @var float */
+	private $force;
+
+	/**
+	 * @param Living     $shooter
+	 * @param Bow        $bow
+	 * @param Projectile $projectile
+	 * @param float      $force
+	 */
+	public function __construct(Living $shooter, Bow $bow, Projectile $projectile, $force){
+		$this->entity = $shooter;
+		$this->bow = $bow;
+		$this->projectile = $projectile;
+		$this->force = $force;
+	}
+
+	/**
+	 * @return Living
+	 */
+	public function getEntity(){
+		return $this->entity;
+	}
+
+	/**
+	 * @return Bow
+	 */
+	public function getBow(){
+		return $this->bow;
+	}
+
+	/**
+	 * @return Projectile
+	 */
+	public function getProjectile(){
+		return $this->projectile;
+	}
+
+	/**
+	 * @return float
+	 */
+	public function getForce(){
+		return $this->force;
+	}
+
+
+}