Merge branch 'php/7.0'

src/pocketmine/item/Item.php

@@ -829,8 +829,22 @@ class Item implements ItemIds, \JsonSerializable{
 		return false;
 	}
 
+	/**
+	 * Called when a player uses the item on air, for example throwing a projectile.
+	 * Returns whether the item was changed, for example count decrease or durability change.
+	 *
+	 * @param Player  $player
+	 * @param Vector3 $directionVector
+	 *
+	 * @return bool
+	 */
+	public function onClickAir(Player $player, Vector3 $directionVector) : bool{
+		return false;
+	}
+
 	/**
 	 * Called when a player is using this item and releases it. Used to handle bow shoot actions.
+	 * Returns whether the item was changed, for example count decrease or durability change.
 	 *
 	 * @param Player $player
 	 * @return bool

src/pocketmine/item/ProjectileItem.php

@@ -0,0 +1,80 @@
+<?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/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\item;
+
+use pocketmine\entity\Entity;
+use pocketmine\entity\Projectile;
+use pocketmine\event\entity\ProjectileLaunchEvent;
+use pocketmine\level\sound\LaunchSound;
+use pocketmine\math\Vector3;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\DoubleTag;
+use pocketmine\nbt\tag\FloatTag;
+use pocketmine\nbt\tag\ListTag;
+use pocketmine\Player;
+
+abstract class ProjectileItem extends Item{
+
+	abstract public function getProjectileEntityType() : string;
+
+	abstract public function getThrowForce() : float;
+
+	public function onClickAir(Player $player, Vector3 $directionVector) : bool{
+		$nbt = new CompoundTag("", [
+			new ListTag("Pos", [
+				new DoubleTag("", $player->x),
+				new DoubleTag("", $player->y + $player->getEyeHeight()),
+				new DoubleTag("", $player->z)
+			]),
+			new ListTag("Motion", [
+				new DoubleTag("", $directionVector->x),
+				new DoubleTag("", $directionVector->y),
+				new DoubleTag("", $directionVector->z)
+			]),
+			new ListTag("Rotation", [
+				new FloatTag("", $player->yaw),
+				new FloatTag("", $player->pitch)
+			]),
+		]);
+
+		$snowball = Entity::createEntity($this->getProjectileEntityType(), $player->getLevel(), $nbt, $player);
+		$snowball->setMotion($snowball->getMotion()->multiply($this->getThrowForce()));
+
+		$this->count--;
+
+		if($snowball instanceof Projectile){
+			$player->getServer()->getPluginManager()->callEvent($projectileEv = new ProjectileLaunchEvent($snowball));
+			if($projectileEv->isCancelled()){
+				$snowball->kill();
+			}else{
+				$snowball->spawnToAll();
+				$player->getLevel()->addSound(new LaunchSound($player), $player->getViewers());
+			}
+		}else{
+			$snowball->spawnToAll();
+		}
+
+		return true;
+	}
+}

src/pocketmine/item/Snowball.php

@@ -23,8 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-
-class Snowball extends Item{
+class Snowball extends ProjectileItem{
 	public function __construct(int $meta = 0){
 		parent::__construct(self::SNOWBALL, $meta, "Snowball");
 	}
@@ -33,4 +32,11 @@ class Snowball extends Item{
 		return 16;
 	}
 
+	public function getProjectileEntityType() : string{
+		return "Snowball";
+	}
+
+	public function getThrowForce() : float{
+		return 1.5;
+	}
 }