Requested changes

Author: ipad54

src/block/Liquid.php

@@ -329,7 +329,7 @@ private function onFlowUpdate() : void{
 			if($adjacentDecay <= self::MAX_DECAY){
 				$calculator = new MinimumCostFlowCalculator($world, $this->getFlowDecayPerBlock(), $this->canFlowInto(...));
 				foreach($calculator->getOptimalFlowDirections($x, $y, $z) as $facing){
-					if(!$this->isSideAvailable($owningBlock, Facing::opposite($facing))){
+					if(!$this->isSideAvailable($owningBlock, $facing)){
 						continue;
 					}
 					[$dx, $dy, $dz] = Facing::OFFSET[$facing];
@@ -359,7 +359,7 @@ protected function flowIntoBlock(Block $block, int $newFlowDecay, bool $falling)
 	/** @phpstan-impure */
 	private function getSmallestFlowDecay(Block $block, int $decay, int $face) : int{
 		$liquid = $this->unpackLiquid($block);
-		if(!($liquid instanceof Liquid) || !$liquid->hasSameTypeId($this) || !$this->isSideAvailable($block, $face)){
+		if(!($liquid instanceof Liquid) || !$liquid->hasSameTypeId($this) || !$this->isSideAvailable($block, Facing::opposite($face))){
 			return $decay;
 		}
 

src/block/Stair.php

@@ -89,9 +89,7 @@ public function setShape(StairShape $shape) : self{
 	}
 
 	public function isSideOpenToFlow(int $face) : bool{
-		return
-			($this->upsideDown || $face !== Facing::DOWN) &&
-			($this->shape !== StairShape::STRAIGHT || Facing::opposite($this->facing) !== $face);
+		return $this->getSupportType($face) !== SupportType::FULL;
 	}
 
 	protected function recalculateCollisionBoxes() : array{

src/network/mcpe/handler/InGamePacketHandler.php

@@ -44,6 +44,7 @@
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\StringTag;
+use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\InventoryManager;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\ActorEventPacket;
@@ -498,13 +499,27 @@ private function handleUseItemTransaction(UseItemTransactionData $data) : bool{
 
 				$blockPos = $data->getBlockPosition();
 				$vBlockPos = new Vector3($blockPos->getX(), $blockPos->getY(), $blockPos->getZ());
-				$this->player->interactBlock($vBlockPos, $data->getFace(), $clickPos, $data->getBlockRuntimeId());
-				if($data->getClientInteractPrediction() === PredictedResult::SUCCESS){
-					//always sync this in case plugins caused a different result than the client expected
-					//we *could* try to enhance detection of plugin-altered behaviour, but this would require propagating
-					//more information up the stack. For now I think this is good enough.
-					//if only the client would tell us what blocks it thinks changed...
-					$this->syncBlocksNearby($vBlockPos, $data->getFace());
+				if($this->player->canInteract($vBlockPos->add(0.5, 0.5, 0.5), 15)){
+					$block = $this->player->getWorld()->getBlock($vBlockPos);
+					$blockTranslator = TypeConverter::getInstance()->getBlockTranslator();
+					$clientRuntimeId = $data->getBlockRuntimeId();
+					$interactContainedBlock = false;
+
+					if(($displaced = $block->getDisplacedBlock()) !== null && $blockTranslator->internalIdToNetworkId($displaced->getStateId()) === $clientRuntimeId){
+						$interactContainedBlock = true;
+					}elseif($blockTranslator->internalIdToNetworkId($block->getStateId()) !== $clientRuntimeId){
+						$this->syncBlocksNearby($vBlockPos, $data->getFace());
+						return true;
+					}
+
+					$this->player->interactBlock($vBlockPos, $data->getFace(), $clickPos, $interactContainedBlock);
+					if($data->getClientInteractPrediction() === PredictedResult::SUCCESS){
+						//always sync this in case plugins caused a different result than the client expected
+						//we *could* try to enhance detection of plugin-altered behaviour, but this would require propagating
+						//more information up the stack. For now I think this is good enough.
+						//if only the client would tell us what blocks it thinks changed...
+						$this->syncBlocksNearby($vBlockPos, $data->getFace());
+					}
 				}
 				return true;
 			case UseItemTransactionData::ACTION_CLICK_AIR:

src/player/Player.php

@@ -108,7 +108,6 @@
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
-use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\AnimatePacket;
 use pocketmine\network\mcpe\protocol\MovePlayerPacket;
@@ -1927,20 +1926,15 @@ public function breakBlock(Vector3 $pos) : bool{
 	 *
 	 * @return bool if it did something
 	 */
-	public function interactBlock(Vector3 $pos, int $face, Vector3 $clickOffset, ?int $blockRuntimeId = null) : bool{
+	public function interactBlock(Vector3 $pos, int $face, Vector3 $clickOffset, bool $interactContainedBlock = false) : bool{
 		$this->setUsingItem(false);
 
 		if($this->canInteract($pos->add(0.5, 0.5, 0.5), $this->isCreative() ? self::MAX_REACH_DISTANCE_CREATIVE : self::MAX_REACH_DISTANCE_SURVIVAL)){
 			$this->broadcastAnimation(new ArmSwingAnimation($this), $this->getViewers());
 			$item = $this->inventory->getItemInHand(); //this is a copy of the real item
 			$oldItem = clone $item;
 			$returnedItems = [];
-			$world = $this->getWorld();
-			$interactContainedBlock = false;
-			if($blockRuntimeId !== null && ($displacedBlock = $world->getBlock($pos)->getDisplacedBlock()) !== null){
-				$interactContainedBlock = TypeConverter::getInstance()->getBlockTranslator()->internalIdToNetworkId($displacedBlock->getStateId()) === $blockRuntimeId;
-			}
-			if($world->useItemOn($pos, $item, $face, $clickOffset, $this, true, $returnedItems, $interactContainedBlock)){
+			if($this->getWorld()->useItemOn($pos, $item, $face, $clickOffset, $this, true, $returnedItems, $interactContainedBlock)){
 				$this->returnItemsFromAction($oldItem, $item, $returnedItems);
 				return true;
 			}