Merge branch 'release/3.3'

src/pocketmine/entity/projectile/Arrow.php

@@ -61,6 +61,9 @@ class Arrow extends Projectile{
 	/** @var float */
 	protected $punchKnockback = 0.0;
 
+	/** @var int */
+	protected $collideTicks = 0;
+
 	public function __construct(Level $level, CompoundTag $nbt, ?Entity $shootingEntity = null, bool $critical = false){
 		parent::__construct($level, $nbt, $shootingEntity);
 		$this->setCritical($critical);
@@ -70,11 +73,13 @@ class Arrow extends Projectile{
 		parent::initEntity($nbt);
 
 		$this->pickupMode = $nbt->getByte(self::TAG_PICKUP, self::PICKUP_ANY, true);
+		$this->collideTicks = $nbt->getShort("life", $this->collideTicks);
 	}
 
 	public function saveNBT() : CompoundTag{
 		$nbt = parent::saveNBT();
 		$nbt->setByte(self::TAG_PICKUP, $this->pickupMode);
+		$nbt->setShort("life", $this->collideTicks);
 		return $nbt;
 	}
 
@@ -116,9 +121,14 @@ class Arrow extends Projectile{
 
 		$hasUpdate = parent::entityBaseTick($tickDiff);
 
-		if($this->age > 1200){
-			$this->flagForDespawn();
-			$hasUpdate = true;
+		if($this->isCollided){
+			$this->collideTicks += $tickDiff;
+			if($this->collideTicks > 1200){
+				$this->flagForDespawn();
+				$hasUpdate = true;
+			}
+		}else{
+			$this->collideTicks = 0;
 		}
 
 		return $hasUpdate;

src/pocketmine/entity/projectile/EnderPearl.php

@@ -66,7 +66,5 @@ class EnderPearl extends Throwable{
 
 			$owner->attack(new EntityDamageEvent($owner, EntityDamageEvent::CAUSE_FALL, 5));
 		}
-
-		$this->flagForDespawn();
 	}
 }

src/pocketmine/entity/projectile/ExperienceBottle.php

@@ -42,7 +42,5 @@ class ExperienceBottle extends Throwable{
 		$this->level->broadcastLevelSoundEvent($this, LevelSoundEventPacket::SOUND_GLASS);
 
 		$this->level->dropExperience($this, mt_rand(3, 11));
-
-		$this->flagForDespawn();
 	}
 }

src/pocketmine/entity/projectile/Projectile.php

@@ -74,7 +74,6 @@ abstract class Projectile extends Entity{
 
 		$this->setMaxHealth(1);
 		$this->setHealth(1);
-		$this->age = $nbt->getShort("Age", $this->age);
 		$this->damage = $nbt->getDouble("damage", $this->damage);
 
 		do{
@@ -144,7 +143,6 @@ abstract class Projectile extends Entity{
 	public function saveNBT() : CompoundTag{
 		$nbt = parent::saveNBT();
 
-		$nbt->setShort("Age", $this->age);
 		$nbt->setDouble("damage", $this->damage);
 
 		if($this->blockHit !== null){

src/pocketmine/entity/projectile/SplashPotion.php

@@ -127,8 +127,6 @@ class SplashPotion extends Throwable{
 				}
 			}
 		}
-
-		$this->flagForDespawn();
 	}
 
 	/**

src/pocketmine/entity/projectile/Throwable.php

@@ -23,6 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\entity\projectile;
 
+use pocketmine\block\Block;
+use pocketmine\math\RayTraceResult;
+
 abstract class Throwable extends Projectile{
 
 	public $width = 0.25;
@@ -31,18 +34,8 @@ abstract class Throwable extends Projectile{
 	protected $gravity = 0.03;
 	protected $drag = 0.01;
 
-	public function entityBaseTick(int $tickDiff = 1) : bool{
-		if($this->closed){
-			return false;
-		}
-
-		$hasUpdate = parent::entityBaseTick($tickDiff);
-
-		if($this->age > 1200 or $this->isCollided){
-			$this->flagForDespawn();
-			$hasUpdate = true;
-		}
-
-		return $hasUpdate;
+	protected function onHitBlock(Block $blockHit, RayTraceResult $hitResult) : void{
+		parent::onHitBlock($blockHit, $hitResult);
+		$this->flagForDespawn();
 	}
 }