Block break progress improvement

src/player/Player.php

@@ -865,6 +865,29 @@ static function() : void{
 		Timings::$playerChunkSend->stopTiming();
 	}
 
+	/**
+	 * Checks if the player is currently on the ground. This is more accurate than {@link Player::isOnGround()} but slower.
+	 */
+	public function isActuallyOnGround() : bool{
+		$bb = $this->boundingBox->expandedCopy(0, 0.001, 0);
+		$maxY = (int) floor($this->location->y);
+		$minY = $maxY - 1;
+		$floorMinX = (int) floor($bb->minX);
+		$floorMinZ = (int) floor($bb->minZ);
+		$floorMaxX = (int) floor($bb->maxX);
+		$floorMaxZ = (int) floor($bb->maxZ);
+		for ($x = $floorMinX ; $x <= $floorMaxX ; $x++){
+			for ($y = $minY ; $y <= $maxY ; $y++){
+				for ($z = $floorMinZ ; $z <= $floorMaxZ ; $z++){
+					if ($this->getWorld()->getBlockAt($x, $y, $z)->collidesWithBB($bb)){
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+
 	private function recheckBroadcastPermissions() : void{
 		foreach([
 			DefaultPermissionNames::BROADCAST_ADMIN => Server::BROADCAST_CHANNEL_ADMINISTRATIVE,

src/player/SurvivalBlockBreakHandler.php

@@ -25,6 +25,8 @@
 
 use pocketmine\block\Block;
 use pocketmine\entity\animation\ArmSwingAnimation;
+use pocketmine\entity\effect\VanillaEffects;
+use pocketmine\item\enchantment\VanillaEnchantments;
 use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\network\mcpe\protocol\LevelEventPacket;
@@ -65,11 +67,29 @@ private function calculateBreakProgressPerTick() : float{
 		if(!$this->block->getBreakInfo()->isBreakable()){
 			return 0.0;
 		}
-		//TODO: improve this to take stuff like swimming, ladders, enchanted tools into account, fix wrong tool break time calculations for bad tools (pmmp/PocketMine-MP#211)
 		$breakTimePerTick = $this->block->getBreakInfo()->getBreakTime($this->player->getInventory()->getItemInHand()) * 20;
-
+		if (!$this->player->isActuallyOnGround() && !$this->player->isFlying()){
+			$breakTimePerTick *= 5;
+		}
+		if ($this->player->isUnderwater() && !$this->player->getArmorInventory()->getHelmet()->hasEnchantment(VanillaEnchantments::AQUA_AFFINITY())){
+			$breakTimePerTick *= 5;
+		}
 		if($breakTimePerTick > 0){
-			return 1 / $breakTimePerTick;
+			$progressPerTick = 1 / $breakTimePerTick;
+
+			$haste = $this->player->getEffects()->get(VanillaEffects::HASTE());
+			if ($haste !== null){
+				$amplifier = $haste->getAmplifier() + 1;
+				$progressPerTick *= (1 + 0.2 * $amplifier) * (1.2 ** $amplifier);
+			}
+
+			$miningFatigue = $this->player->getEffects()->get(VanillaEffects::MINING_FATIGUE());
+			if ($miningFatigue !== null){
+				$amplifier = $miningFatigue->getAmplifier() + 1;
+				$progressPerTick *= 0.21 ** $amplifier;
+			}
+
+			return $progressPerTick;
 		}
 		return 1;
 	}
@@ -82,7 +102,10 @@ public function update() : bool{
 		$newBreakSpeed = $this->calculateBreakProgressPerTick();
 		if(abs($newBreakSpeed - $this->breakSpeed) > 0.0001){
 			$this->breakSpeed = $newBreakSpeed;
-			//TODO: sync with client
+			$this->player->getWorld()->broadcastPacketToViewers(
+				$this->blockPos,
+				LevelEventPacket::create(LevelEvent::BLOCK_BREAK_SPEED, (int) (65535 * $this->breakSpeed), $this->blockPos)
+			);
 		}
 
 		$this->breakProgress += $this->breakSpeed;