Moved projectile-related classes to their own namespace

src/pocketmine/entity/projectile/Arrow.php

@@ -0,0 +1,98 @@
+<?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\entity\projectile;
+
+use pocketmine\entity\Entity;
+use pocketmine\level\Level;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\network\mcpe\protocol\AddEntityPacket;
+use pocketmine\Player;
+
+class Arrow extends Projectile{
+	const NETWORK_ID = 80;
+
+	public $width = 0.25;
+	public $height = 0.25;
+
+	protected $gravity = 0.05;
+	protected $drag = 0.01;
+
+	protected $damage = 2;
+
+	public function __construct(Level $level, CompoundTag $nbt, Entity $shootingEntity = null, bool $critical = false){
+		parent::__construct($level, $nbt, $shootingEntity);
+		$this->setCritical($critical);
+	}
+
+	public function isCritical() : bool{
+		return $this->getGenericFlag(self::DATA_FLAG_CRITICAL);
+	}
+
+	public function setCritical(bool $value = true){
+		$this->setGenericFlag(self::DATA_FLAG_CRITICAL, $value);
+	}
+
+	public function getResultDamage() : int{
+		$base = parent::getResultDamage();
+		if($this->isCritical()){
+			return ($base + mt_rand(0, (int) ($base / 2) + 1));
+		}else{
+			return $base;
+		}
+	}
+
+	public function entityBaseTick(int $tickDiff = 1) : bool{
+		if($this->closed){
+			return false;
+		}
+
+		$hasUpdate = parent::entityBaseTick($tickDiff);
+
+		if($this->onGround or $this->hadCollision){
+			$this->setCritical(false);
+		}
+
+		if($this->age > 1200){
+			$this->close();
+			$hasUpdate = true;
+		}
+
+		return $hasUpdate;
+	}
+
+	public function spawnTo(Player $player){
+		$pk = new AddEntityPacket();
+		$pk->type = Arrow::NETWORK_ID;
+		$pk->entityRuntimeId = $this->getId();
+		$pk->position = $this->asVector3();
+		$pk->motion = $this->getMotion();
+
+		$pk->yaw = $this->yaw;
+		$pk->pitch = $this->pitch;
+		$pk->metadata = $this->dataProperties;
+		$player->dataPacket($pk);
+
+		parent::spawnTo($player);
+	}
+}

src/pocketmine/entity/projectile/Projectile.php

@@ -0,0 +1,191 @@
+<?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\entity\projectile;
+
+use pocketmine\entity\Entity;
+use pocketmine\entity\Living;
+use pocketmine\event\entity\EntityCombustByEntityEvent;
+use pocketmine\event\entity\EntityDamageByChildEntityEvent;
+use pocketmine\event\entity\EntityDamageByEntityEvent;
+use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\event\entity\ProjectileHitEvent;
+use pocketmine\level\Level;
+use pocketmine\level\MovingObjectPosition;
+use pocketmine\math\Vector3;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\nbt\tag\ShortTag;
+
+abstract class Projectile extends Entity{
+
+	const DATA_SHOOTER_ID = 17;
+
+	protected $damage = 0;
+
+	public $hadCollision = false;
+
+	public function __construct(Level $level, CompoundTag $nbt, Entity $shootingEntity = null){
+		if($shootingEntity !== null){
+			$this->setOwningEntity($shootingEntity);
+		}
+		parent::__construct($level, $nbt);
+	}
+
+	public function attack(EntityDamageEvent $source){
+		if($source->getCause() === EntityDamageEvent::CAUSE_VOID){
+			parent::attack($source);
+		}
+	}
+
+	protected function initEntity(){
+		parent::initEntity();
+
+		$this->setMaxHealth(1);
+		$this->setHealth(1);
+		if(isset($this->namedtag->Age)){
+			$this->age = $this->namedtag["Age"];
+		}
+	}
+
+	public function canCollideWith(Entity $entity) : bool{
+		return $entity instanceof Living and !$this->onGround;
+	}
+
+	/**
+	 * Returns the amount of damage this projectile will deal to the entity it hits.
+	 * @return int
+	 */
+	public function getResultDamage() : int{
+		return (int) ceil(sqrt($this->motionX ** 2 + $this->motionY ** 2 + $this->motionZ ** 2) * $this->damage);
+	}
+
+	public function onCollideWithEntity(Entity $entity){
+		$this->server->getPluginManager()->callEvent(new ProjectileHitEvent($this));
+
+		$damage = $this->getResultDamage();
+
+		if($this->getOwningEntity() === null){
+			$ev = new EntityDamageByEntityEvent($this, $entity, EntityDamageEvent::CAUSE_PROJECTILE, $damage);
+		}else{
+			$ev = new EntityDamageByChildEntityEvent($this->getOwningEntity(), $this, $entity, EntityDamageEvent::CAUSE_PROJECTILE, $damage);
+		}
+
+		$entity->attack($ev);
+
+		$this->hadCollision = true;
+
+		if($this->fireTicks > 0){
+			$ev = new EntityCombustByEntityEvent($this, $entity, 5);
+			$this->server->getPluginManager()->callEvent($ev);
+			if(!$ev->isCancelled()){
+				$entity->setOnFire($ev->getDuration());
+			}
+		}
+
+		$this->close();
+	}
+
+	public function saveNBT(){
+		parent::saveNBT();
+		$this->namedtag->Age = new ShortTag("Age", $this->age);
+	}
+
+	protected function applyDragBeforeGravity() : bool{
+		return true;
+	}
+
+	public function entityBaseTick(int $tickDiff = 1) : bool{
+		if($this->closed){
+			return false;
+		}
+
+		$hasUpdate = parent::entityBaseTick($tickDiff);
+
+		if($this->isAlive()){
+			$movingObjectPosition = null;
+
+			$moveVector = new Vector3($this->x + $this->motionX, $this->y + $this->motionY, $this->z + $this->motionZ);
+
+			$list = $this->getLevel()->getCollidingEntities($this->boundingBox->addCoord($this->motionX, $this->motionY, $this->motionZ)->expand(1, 1, 1), $this);
+
+			$nearDistance = PHP_INT_MAX;
+			$nearEntity = null;
+
+			foreach($list as $entity){
+				if(/*!$entity->canCollideWith($this) or */
+				($entity->getId() === $this->getOwningEntityId() and $this->ticksLived < 5)
+				){
+					continue;
+				}
+
+				$axisalignedbb = $entity->boundingBox->grow(0.3, 0.3, 0.3);
+				$ob = $axisalignedbb->calculateIntercept($this, $moveVector);
+
+				if($ob === null){
+					continue;
+				}
+
+				$distance = $this->distanceSquared($ob->hitVector);
+
+				if($distance < $nearDistance){
+					$nearDistance = $distance;
+					$nearEntity = $entity;
+				}
+			}
+
+			if($nearEntity !== null){
+				$movingObjectPosition = MovingObjectPosition::fromEntity($nearEntity);
+			}
+
+			if($movingObjectPosition !== null){
+				if($movingObjectPosition->entityHit !== null){
+					$this->onCollideWithEntity($movingObjectPosition->entityHit);
+					return false;
+				}
+			}
+
+			if($this->isCollided and !$this->hadCollision){ //Collided with a block
+				$this->hadCollision = true;
+
+				$this->motionX = 0;
+				$this->motionY = 0;
+				$this->motionZ = 0;
+
+				$this->server->getPluginManager()->callEvent(new ProjectileHitEvent($this));
+				return false;
+			}elseif(!$this->isCollided and $this->hadCollision){ //Previously collided with block, but block later removed
+				$this->hadCollision = false;
+			}
+
+			if(!$this->hadCollision or abs($this->motionX) > self::MOTION_THRESHOLD or abs($this->motionY) > self::MOTION_THRESHOLD or abs($this->motionZ) > self::MOTION_THRESHOLD){
+				$f = sqrt(($this->motionX ** 2) + ($this->motionZ ** 2));
+				$this->yaw = (atan2($this->motionX, $this->motionZ) * 180 / M_PI);
+				$this->pitch = (atan2($this->motionY, $f) * 180 / M_PI);
+				$hasUpdate = true;
+			}
+		}
+
+		return $hasUpdate;
+	}
+
+}

src/pocketmine/entity/projectile/ProjectileSource.php

@@ -0,0 +1,29 @@
+<?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\entity\projectile;
+
+
+interface ProjectileSource{
+
+}

src/pocketmine/entity/projectile/Snowball.php

@@ -0,0 +1,71 @@
+<?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\entity\projectile;
+
+use pocketmine\entity\Entity;
+use pocketmine\level\Level;
+use pocketmine\nbt\tag\CompoundTag;
+use pocketmine\network\mcpe\protocol\AddEntityPacket;
+use pocketmine\Player;
+
+class Snowball extends Projectile{
+	const NETWORK_ID = 81;
+
+	public $width = 0.25;
+	public $height = 0.25;
+
+	protected $gravity = 0.03;
+	protected $drag = 0.01;
+
+	public function __construct(Level $level, CompoundTag $nbt, Entity $shootingEntity = null){
+		parent::__construct($level, $nbt, $shootingEntity);
+	}
+
+	public function entityBaseTick(int $tickDiff = 1) : bool{
+		if($this->closed){
+			return false;
+		}
+
+		$hasUpdate = parent::entityBaseTick($tickDiff);
+
+		if($this->age > 1200 or $this->isCollided){
+			$this->kill();
+			$hasUpdate = true;
+		}
+
+		return $hasUpdate;
+	}
+
+	public function spawnTo(Player $player){
+		$pk = new AddEntityPacket();
+		$pk->type = Snowball::NETWORK_ID;
+		$pk->entityRuntimeId = $this->getId();
+		$pk->position = $this->asVector3();
+		$pk->motion = $this->getMotion();
+		$pk->metadata = $this->dataProperties;
+		$player->dataPacket($pk);
+
+		parent::spawnTo($player);
+	}
+}