Merge remote-tracking branch 'upstream/stable' into stable

Author: dearminder

src/pocketmine/command/utils/CommandSelector.php

@@ -98,4 +98,16 @@ public static function findTargets(CommandSender $sender, string $selector, stri
 
 		return $targets;
 	}
+
+	/**
+	 * @param CommandSender $sender
+	 * @param string        $selector
+	 * @param string        $entityType
+	 * @param Vector3|null  $pos
+	 *
+	 * @return Entity|null
+	 */
+	public static function findTarget(CommandSender $sender, string $selector, string $entityType = Entity::class, ?Vector3 $pos = null) : ?Entity{
+		return !empty($targets = self::findTargets($sender, $selector, $entityType, $pos)) ? reset($targets) : null;
+	}
 }

src/pocketmine/entity/Entity.php

@@ -47,6 +47,7 @@
 use pocketmine\entity\hostile\ZombieVillager;
 use pocketmine\entity\hostile\Dolphin;
 use pocketmine\entity\object\ArmorStand;
+use pocketmine\entity\object\EnderCrystal;
 use pocketmine\entity\object\ExperienceOrb;
 use pocketmine\entity\object\FallingBlock;
 use pocketmine\entity\object\FireworksRocket;
@@ -435,6 +436,7 @@ public static function init() : void{
 		Entity::registerEntity(FireworksRocket::class, false, ['FireworksRocket', 'minecraft:fireworks_rocket']);
 		Entity::registerEntity(Slime::class, false, ['Slime', 'minecraft:slime']);
 		Entity::registerEntity(MagmaCube::class, false, ['MagmaCube', 'minecraft:magma_cube']);
+		Entity::registerEntity(EnderCrystal::class, false, ['EnderCrystal', 'minecraft:ender_crystal']);
 
 		Entity::registerEntity(Human::class, true);
 
@@ -868,11 +870,7 @@ public function setRiding(bool $value) : void{
 	}
 
 	public function getRidingEntity() : ?Entity{
-		if($this->ridingEid !== null){
-			return $this->server->findEntity($this->ridingEid);
-		}else{
-			return null;
-		}
+		return $this->ridingEid !== null ? $this->server->findEntity($this->ridingEid) : null;
 	}
 
 	public function setRidingEntity(?Entity $ridingEntity = null) : void{
@@ -884,11 +882,7 @@ public function setRidingEntity(?Entity $ridingEntity = null) : void{
 	}
 
 	public function getRiddenByEntity() : ?Entity{
-		if($this->riddenByEid !== null){
-			return $this->server->findEntity($this->riddenByEid);
-		}else{
-			return null;
-		}
+		return $this->riddenByEid !== null ? $this->server->findEntity($this->riddenByEid) : null;
 	}
 
 	public function setRiddenByEntity(?Entity $riddenByEntity = null) : void{
@@ -1648,8 +1642,12 @@ protected function applyGravity() : void{
 		$this->motion->y -= $this->gravity;
 	}
 
+	protected function getDefaultDrag() : float{
+		return 0.09;
+	}
+
 	protected function tryChangeMovement() : void{
-		$friction = 0.91;
+		$friction = 1 - $this->getDefaultDrag();
 
 		if($this->applyDragBeforeGravity()){
 			$this->motion->y *= $friction;
@@ -1941,9 +1939,8 @@ protected function updateFallState(float $distanceThisTick, bool $onGround) : vo
 	}
 
 	public function mountEntity(Entity $entity, int $seatNumber = 0) : bool{
-		if($this->getRidingEntity() == null and $entity !== $this and count($entity->passengers) < $entity->getSeatCount()){
+		if($this->getRidingEntity() === null and $entity !== $this and count($entity->passengers) < $entity->getSeatCount()){
 			if(!isset($entity->passengers[$seatNumber])){
-
 				if($seatNumber === 0){
 					$entity->setRiddenByEntity($this);
 
@@ -2004,9 +2001,9 @@ public function dismountEntity(bool $immediate = false) : bool{
 		if($this->getRidingEntity() !== null){
 			$entity = $this->getRidingEntity();
 
-			unset($entity->passengers[array_search($this->getId(), $entity->passengers, true)]);
+			unset($entity->passengers[$this->propertyManager->getByte(self::DATA_CONTROLLING_RIDER_SEAT_NUMBER)]);
 
-			if($this->isRiding()){
+			if($entity->getRiddenByEntity() === $this){
 				$entity->setRiddenByEntity(null);
 
 				$this->entityRiderYawDelta = 0;

src/pocketmine/entity/Human.php

@@ -620,17 +620,6 @@ protected function initHumanData() : void{
 			$this->setNameTag($this->namedtag->getString("NameTag"));
 		}
 
-		$skin = $this->namedtag->getCompoundTag("Skin");
-		if($skin !== null){
-			$this->setSkin(new Skin(
-				$skin->getString("Name"),
-				$skin->hasTag("Data", StringTag::class) ? $skin->getString("Data") : $skin->getByteArray("Data"), //old data (this used to be saved as a StringTag in older versions of PM)
-				$skin->hasTag("CapeData", ByteArrayTag::class) ? $skin->getByteArray("CapeData", "") : $skin->getString("CapeData", ""),
-				$skin->getString("GeometryName", ""),
-				$skin->hasTag("GeometryData", ByteArrayTag::class) ? $skin->getByteArray("GeometryData", "") : $skin->getString("GeometryData", "")
-			));
-		}
-
 		$this->uuid = UUID::fromData((string) $this->getId(), $this->skin->getSkinData(), $this->getNameTag());
 	}
 

src/pocketmine/entity/object/EnderCrystal.php

@@ -0,0 +1,84 @@
+<?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 TuranicTeam
+ * @link https://github.com/TuranicTeam/Altay
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\entity\object;
+
+use pocketmine\block\Block;
+use pocketmine\block\Fire;
+use pocketmine\entity\Entity;
+use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\level\Explosion;
+use pocketmine\level\GameRules;
+use pocketmine\level\generator\end\End;
+
+class EnderCrystal extends Entity{
+	public const NETWORK_ID = self::ENDER_CRYSTAL;
+
+	public $height = 0.98;
+	public $width = 0.98;
+
+	public $gravity = 0;
+	public $drag = 0;
+
+	public function onMovementUpdate() : void{
+		// NOOP
+	}
+
+	public function onUpdate(int $currentTick) : bool{
+		if($this->level->getProvider()->getPath() === End::class){
+			if($this->level->getBlock($this)->getId() !== Block::FIRE){
+				$this->level->setBlock($this, new Fire());
+			}
+		}
+
+		return parent::onUpdate($currentTick);
+	}
+
+	public function attack(EntityDamageEvent $source) : void{
+		parent::attack($source);
+
+		if(!$source->isCancelled() and $source->getCause() !== EntityDamageEvent::CAUSE_FIRE and $source->getCause() !== EntityDamageEvent::CAUSE_FIRE_TICK){
+			$this->flagForDespawn();
+
+			if($this->level->getGameRules()->getBool(GameRules::RULE_TNT_EXPLODES)){
+				$exp = new Explosion($this, 6, $this);
+
+				$exp->explodeA();
+				$exp->explodeB();
+			}
+		}
+	}
+
+	public function canBeCollidedWith() : bool{
+		return false;
+	}
+
+	public function setShowBase(bool $value) : void{
+		$this->setGenericFlag(self::DATA_FLAG_SHOWBASE, $value);
+	}
+
+	public function showBase() : bool{
+		return $this->getGenericFlag(self::DATA_FLAG_SHOWBASE);
+	}
+}

src/pocketmine/entity/object/ItemEntity.php

@@ -23,11 +23,14 @@
 
 namespace pocketmine\entity\object;
 
+use pocketmine\block\Water;
 use pocketmine\entity\Entity;
 use pocketmine\event\entity\ItemDespawnEvent;
 use pocketmine\event\entity\ItemSpawnEvent;
 use pocketmine\event\inventory\InventoryPickupItemEvent;
 use pocketmine\item\Item;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\network\mcpe\protocol\ActorEventPacket;
 use pocketmine\network\mcpe\protocol\AddItemActorPacket;
 use pocketmine\network\mcpe\protocol\TakeItemActorPacket;
 use pocketmine\Player;
@@ -52,7 +55,7 @@ class ItemEntity extends Entity{
 	protected $gravity = 0.04;
 	protected $drag = 0.02;
 
-	public $canCollide = false;
+	public $canCollide = true;
 
 	/** @var int */
 	protected $age = 0;
@@ -61,13 +64,13 @@ protected function initEntity() : void{
 		parent::initEntity();
 
 		$this->setMaxHealth(5);
+		$this->setImmobile(true);
 		$this->setHealth($this->namedtag->getShort("Health", (int) $this->getHealth()));
 		$this->age = $this->namedtag->getShort("Age", $this->age);
 		$this->pickupDelay = $this->namedtag->getShort("PickupDelay", $this->pickupDelay);
 		$this->owner = $this->namedtag->getString("Owner", $this->owner);
 		$this->thrower = $this->namedtag->getString("Thrower", $this->thrower);
 
-
 		$itemTag = $this->namedtag->getCompoundTag("Item");
 		if($itemTag === null){
 			throw new \UnexpectedValueException("Invalid " . get_class($this) . " entity: expected \"Item\" NBT tag not found");
@@ -95,6 +98,32 @@ public function entityBaseTick(int $tickDiff = 1) : bool{
 				$this->pickupDelay = 0;
 			}
 
+			if($this->ticksLived % 60 === 0){
+				foreach($this->level->getCollidingEntities($this->getBoundingBox()->expandedCopy(1, 1, 1), $this) as $entity){
+					if($entity instanceof ItemEntity){
+						$item = $this->getItem();
+						if($item->getCount() < $item->getMaxStackSize()){
+							if($entity->getItem()->equals($item, true, true)){
+								$nextAmount = $item->getCount() + $entity->getItem()->getCount();
+								if($nextAmount <= $item->getMaxStackSize()){
+									if($this->ticksLived > $entity->ticksLived){
+										$entity->flagForDespawn();
+
+										$item->setCount($nextAmount);
+										$this->broadcastEntityEvent(ActorEventPacket::ITEM_ENTITY_MERGE, $nextAmount);
+									}else{
+										$this->flagForDespawn();
+
+										$entity->getItem()->setCount($nextAmount);
+										$entity->broadcastEntityEvent(ActorEventPacket::ITEM_ENTITY_MERGE, $nextAmount);
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+
 			$this->age += $tickDiff;
 			if($this->age > 6000){
 				$ev = new ItemDespawnEvent($this);
@@ -111,6 +140,10 @@ public function entityBaseTick(int $tickDiff = 1) : bool{
 		return $hasUpdate;
 	}
 
+	protected function getDefaultDrag() : float{
+		return 0.02;
+	}
+
 	protected function tryChangeMovement() : void{
 		$this->checkObstruction($this->x, $this->y, $this->z);
 		parent::tryChangeMovement();
@@ -120,6 +153,28 @@ protected function applyDragBeforeGravity() : bool{
 		return true;
 	}
 
+	protected function applyGravity() : void{
+		$bb = $this->getBoundingBox();
+		$waterCount = 0;
+
+		for($j = 0; $j < 5; ++$j){
+			$d1 = $bb->minY + ($bb->maxY - $bb->minY) * $j / 5 + 0.4;
+			$d3 = $bb->minY + ($bb->maxY - $bb->minY) * ($j + 1) / 5 + 1;
+
+			$bb2 = new AxisAlignedBB($bb->minX, $d1, $bb->minZ, $bb->maxX, $d3, $bb->maxZ);
+
+			if($this->level->isLiquidInBoundingBox($bb2, new Water())){
+				$waterCount += 0.2;
+			}
+		}
+
+		if($waterCount > 0){
+			$this->motion->y += 0.002 * ($waterCount * 2 - 1);
+		}else{
+			$this->motion->y -= $this->gravity;
+		}
+	}
+
 	public function saveNBT() : void{
 		parent::saveNBT();
 		$this->namedtag->setTag($this->item->nbtSerialize(-1, "Item"));
@@ -142,11 +197,7 @@ public function getItem() : Item{
 	}
 
 	public function canCollideWith(Entity $entity) : bool{
-		return false;
-	}
-
-	public function canBeCollidedWith() : bool{
-		return false;
+		return parent::canCollideWith($entity) and $entity instanceof ItemEntity;
 	}
 
 	/**

src/pocketmine/entity/projectile/FishingHook.php

@@ -96,6 +96,8 @@ public function __construct(Level $level, CompoundTag $nbt, ?Entity $owner = nul
 	 * @param RayTraceResult $hitResult
 	 */
 	public function onHitEntity(Entity $entityHit, RayTraceResult $hitResult) : void{
+		$entityHit->attack(new EntityDamageByEntityEvent($this, $entityHit, EntityDamageEvent::CAUSE_ENTITY_ATTACK, 0));
+
 		$this->mountEntity($entityHit);
 	}
 

src/pocketmine/entity/projectile/Projectile.php

@@ -340,4 +340,8 @@ protected function onHitBlock(Block $blockHit, RayTraceResult $hitResult) : void
 		$this->blockHitId = $blockHit->getId();
 		$this->blockHitData = $blockHit->getDamage();
 	}
+
+	public function getDefaultDrag() : float{
+		return 0;
+	}
 }