Apply requested changes

Author: ipad54

src/block/utils/WaterloggableTrait.php

@@ -25,12 +25,15 @@
 
 use pocketmine\block\Block;
 use pocketmine\block\BlockTypeTags;
+use pocketmine\block\RuntimeBlockStateRegistry;
 use pocketmine\block\Water;
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
+use pocketmine\utils\AssumptionFailedError;
 use pocketmine\world\BlockTransaction;
+use pocketmine\world\format\Chunk;
 
 trait WaterloggableTrait{
 
@@ -74,7 +77,21 @@ public function hasEntityCollision() : bool{
 	}
 
 	public function readStateFromWorld() : Block{
-		$this->containedWater?->readStateFromWorld();
+		$world = $this->position->getWorld();
+		$chunk = $world->getOrLoadChunkAtPosition($this->position);
+		if($chunk === null){
+			throw new AssumptionFailedError("Chunk must be already loaded before calling this method");
+		}
+
+		$displacedBlockStateId = $chunk->getDisplacedBlockStateId($this->position->getFloorX() & Chunk::COORD_MASK, $this->position->getFloorY(), $this->position->getFloorZ() & Chunk::COORD_MASK);
+		if($displacedBlockStateId !== Block::EMPTY_STATE_ID && ($displacedBlock = RuntimeBlockStateRegistry::getInstance()->fromStateId($displacedBlockStateId)) instanceof Water){
+			$displacedBlock->position($world, $this->position->getFloorX(), $this->position->getFloorY(), $this->position->getFloorZ());
+			$displacedBlock->readStateFromWorld();
+
+			$this->containedWater = $displacedBlock;
+		}else{
+			$this->containedWater = null;
+		}
 		return $this;
 	}
 

src/item/Bucket.php

@@ -41,6 +41,7 @@ public function getMaxStackSize() : int{
 	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, array &$returnedItems) : ItemUseResult{
 		//TODO: move this to generic placement logic
 
+		$blockClicked = $player->getWorld()->getBlock($blockClicked->getPosition()); //We might interact a displaced block
 		if($blockClicked instanceof Waterloggable && ($water = $blockClicked->getContainedWater()) !== null && $water->isSource()){
 			$resultBlock = (clone $blockClicked)->setContainedWater(null);
 			$liquid = $blockClicked->getContainedWater();

src/item/LiquidBucket.php

@@ -60,6 +60,7 @@ public function getFuelResidue() : Item{
 	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, array &$returnedItems) : ItemUseResult{
 		//TODO: move this to generic placement logic
 
+		$blockClicked = $player->getWorld()->getBlock($blockClicked->getPosition()); //We might interact a displaced block
 		$targetBlock = null;
 		$resultBlock = null;
 

src/network/mcpe/handler/InGamePacketHandler.php

@@ -45,7 +45,6 @@
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\StringTag;
 use pocketmine\network\FilterNoisyPacketException;
-use pocketmine\network\mcpe\convert\TypeConverter;
 use pocketmine\network\mcpe\InventoryManager;
 use pocketmine\network\mcpe\NetworkSession;
 use pocketmine\network\mcpe\protocol\ActorEventPacket;
@@ -501,7 +500,7 @@ private function handleUseItemTransaction(UseItemTransactionData $data) : bool{
 				$vBlockPos = new Vector3($blockPos->getX(), $blockPos->getY(), $blockPos->getZ());
 				if($vBlockPos->distanceSquared($this->player->getLocation()) < 10000){
 					$block = $this->player->getWorld()->getBlock($vBlockPos);
-					$blockTranslator = TypeConverter::getInstance()->getBlockTranslator();
+					$blockTranslator = $this->session->getTypeConverter()->getBlockTranslator();
 					$clientRuntimeId = $data->getBlockRuntimeId();
 					$interactDisplacedBlock = false;
 

src/world/World.php

@@ -36,7 +36,6 @@
 use pocketmine\block\UnknownBlock;
 use pocketmine\block\utils\Waterloggable;
 use pocketmine\block\VanillaBlocks;
-use pocketmine\block\Water;
 use pocketmine\data\bedrock\BiomeIds;
 use pocketmine\data\bedrock\block\BlockStateData;
 use pocketmine\data\bedrock\block\BlockStateDeserializeException;
@@ -2029,21 +2028,14 @@ public function getBlockAt(int $x, int $y, int $z, bool $cached = true, bool $ad
 			$chunk = $this->chunks[$chunkHash] ?? null;
 			if($chunk !== null){
 				$block = $this->blockStateRegistry->fromStateId($chunk->getBlockStateId($x & Chunk::COORD_MASK, $y, $z & Chunk::COORD_MASK));
-				$displacedBlockStateId = $chunk->getDisplacedBlockStateId($x & Chunk::COORD_MASK, $y, $z & Chunk::COORD_MASK);
 			}else{
 				$addToCache = false;
 				$block = VanillaBlocks::AIR();
-				$displacedBlockStateId = Block::EMPTY_STATE_ID;
 			}
 		}else{
 			$block = VanillaBlocks::AIR();
-			$displacedBlockStateId = Block::EMPTY_STATE_ID;
 		}
 
-		if($block instanceof Waterloggable && $displacedBlockStateId !== Block::EMPTY_STATE_ID){
-			$displacedBlockStateId = $this->blockStateRegistry->fromStateId($displacedBlockStateId);
-			$block->setContainedWater($displacedBlockStateId instanceof Water ? $displacedBlockStateId : null);
-		}
 		$block->position($this, $x, $y, $z);
 
 		if($this->inDynamicStateRecalculation){
@@ -2300,6 +2292,9 @@ private function destroyBlockInternal(Block $target, Item $item, ?Player $player
 	 */
 	public function useItemOn(Vector3 $vector, Item &$item, int $face, ?Vector3 $clickVector = null, ?Player $player = null, bool $playSound = false, array &$returnedItems = [], bool $interactDisplacedBlock = false) : bool{
 		$blockClicked = $this->getBlock($vector);
+		if($interactDisplacedBlock){
+			$blockClicked = $blockClicked->getDisplacedBlock() ?? $blockClicked;
+		}
 		$blockReplace = $blockClicked->getSide($face);
 
 		if($clickVector === null){
@@ -2331,8 +2326,6 @@ public function useItemOn(Vector3 $vector, Item &$item, int $face, ?Vector3 $cli
 			if($player->isSneakPressed()){
 				$ev->setUseItem(false);
 				$ev->setUseBlock($item->isNull()); //opening doors is still possible when sneaking if using an empty hand
-			}else{
-				$ev->setUseBlock(!$interactDisplacedBlock);
 			}
 			if($player->isSpectator()){
 				$ev->cancel(); //set it to cancelled so plugins can bypass this