Implement beacon

src/block/Beacon.php

@@ -27,14 +27,87 @@
 use pocketmine\block\inventory\BeaconInventory;
 use pocketmine\block\tile\Beacon as TileBeacon;
 use pocketmine\data\bedrock\EffectIdMap;
+use pocketmine\data\bedrock\EffectIds;
 use pocketmine\entity\effect\Effect;
 use pocketmine\entity\effect\EffectInstance;
 use pocketmine\item\Item;
+use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\player\Player;
-use function in_array;
 
 final class Beacon extends Transparent{
+	private const ALLOWED_BLOCK_IDS = [
+		BlockLegacyIds::IRON_BLOCK => true,
+		BlockLegacyIds::GOLD_BLOCK => true,
+		BlockLegacyIds::DIAMOND_BLOCK => true,
+		BlockLegacyIds::EMERALD_BLOCK => true
+		//TODO netherite block
+	];
+
+	private const ALLOWED_PRIMARY_EFFECTS = [
+		EffectIds::HASTE => true,
+		EffectIds::JUMP_BOOST => true,
+		EffectIds::RESISTANCE => true,
+		EffectIds::SPEED => true,
+		EffectIds::STRENGTH => true
+	];
+
+	private const ALLOWED_SECONDARY_EFFECTS = [
+		EffectIds::REGENERATION => true
+	];
+
+	private int $primaryEffect;
+	private int $secondaryEffect;
+
+	public function readStateFromWorld() : void{
+		parent::readStateFromWorld();
+		$tile = $this->position->getWorld()->getTile($this->position);
+		if($tile instanceof TileBeacon){
+			$this->primaryEffect = $tile->getPrimaryEffect();
+			$this->secondaryEffect = $tile->getSecondaryEffect();
+		}
+	}
+
+	public function writeStateToWorld() : void{
+		parent::writeStateToWorld();
+		$tile = $this->position->getWorld()->getTile($this->position);
+		if($tile instanceof TileBeacon){
+			$tile->setPrimaryEffect($this->primaryEffect);
+			$tile->setSecondaryEffect($this->secondaryEffect);
+		}
+	}
+
+	public function getPrimaryEffect() : int{
+		return $this->primaryEffect;
+	}
+
+	/**
+	 * @return $this
+	 * @throws \InvalidArgumentException
+	 */
+	public function setPrimaryEffect(int $primaryEffect) : self{
+		if(!isset(self::ALLOWED_PRIMARY_EFFECTS[$primaryEffect])){
+			throw new \InvalidArgumentException("Effect ID \"$primaryEffect\" is not allowed in the primary effect");
+		}
+		$this->primaryEffect = $primaryEffect;
+		return $this;
+	}
+
+	public function getSecondaryEffect() : int{
+		return $this->secondaryEffect;
+	}
+
+	/**
+	 * @return $this
+	 * @throws \InvalidArgumentException
+	 */
+	public function setSecondaryEffect(int $secondaryEffect) : self{
+		if(!isset(self::ALLOWED_PRIMARY_EFFECTS[$secondaryEffect]) || !isset(self::ALLOWED_SECONDARY_EFFECTS[$secondaryEffect])){
+			throw new \InvalidArgumentException("Effect ID \"$secondaryEffect\" is not allowed in the secondary effect");
+		}
+		$this->secondaryEffect = $secondaryEffect;
+		return $this;
+	}
 
 	public function getLightLevel() : int{
 		return 15;
@@ -49,16 +122,16 @@ public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player
 	}
 
 	public function onScheduledUpdate() : void{
-		$tile = $this->position->getWorld()->getTile($this->position);
-		if(!$tile instanceof TileBeacon){
-			return;
-		}
 		$this->position->getWorld()->scheduleDelayedBlockUpdate($this->position, 20 * 3);
 
-		$primaryE = $tile->getPrimaryEffect();
-		$secondaryE = $tile->getSecondaryEffect();
+		if(!$this->viewSky()){
+			return;
+		}
 
-		if($primaryE === 0 && $secondaryE === 0 || !$this->viewSky()){
+		$effectIdMap = EffectIdMap::getInstance();
+		$primaryE = $effectIdMap->fromId($this->primaryEffect);
+		$secondaryE = $effectIdMap->fromId($this->secondaryEffect);
+		if($primaryE === null && $secondaryE === null){
 			return;
 		}
 
@@ -73,20 +146,23 @@ public function onScheduledUpdate() : void{
 			$radius = (10 * $beaconLevel) + 10;
 			$effectDuration = 9 + (2 * $beaconLevel);
 
-			foreach($this->position->getWorld()->getPlayers() as $player){
-				if($player->getPosition()->distance($this->position) <= $radius){
-					if($primaryE === $secondaryE){
-						$effect = EffectIdMap::getInstance()->fromId($secondaryE);
-						if($effect instanceof Effect){
-							$player->getEffects()->add(new EffectInstance($effect, $effectDuration * 20, 1));
-						}
-						break;
+			$world = $this->position->getWorld();
+			$aabb = (new AxisAlignedBB(0, 0, 0, 1, $world->getMaxY(), 1))->offset($this->position->x, 0, $this->position->z)->expand($radius, 0, $radius);
+			if($primaryE === $secondaryE){
+				if($secondaryE === null){
+					return;
+				}
+				foreach($world->getNearbyEntities($aabb) as $entity){
+					if($entity instanceof Player){
+						$entity->getEffects()->add(new EffectInstance($secondaryE, $effectDuration * 20, 1));
 					}
-					foreach([$primaryE, $secondaryE] as $effectId){
-						if($effectId !== 0){
-							$effect = EffectIdMap::getInstance()->fromId($effectId);
+				}
+			}else{
+				foreach($world->getNearbyEntities($aabb) as $entity){
+					if($entity instanceof Player){
+						foreach([$primaryE, $secondaryE] as $effect){
 							if($effect instanceof Effect){
-								$player->getEffects()->add(new EffectInstance($effect, $effectDuration * 20, 0));
+								$entity->getEffects()->add(new EffectInstance($effect, $effectDuration * 20, 0));
 							}
 						}
 					}
@@ -100,17 +176,12 @@ public function isBeaconLevelValid(int $level) : bool{
 			throw new InvalidArgumentException("Beacon level must be in range 1-4, $level given");
 		}
 
+		$world = $this->position->getWorld();
+		$pos = $this->position->subtract(0, $level, 0);
 		for($x = -$level; $x <= $level; $x++){
 			for($z = -$level; $z <= $level; $z++){
-				$block = $this->position->getWorld()->getBlock($this->position->add($x, 0, $z)->subtract(0, $level, 0));
-				$allowedBlockId = [
-					BlockLegacyIds::IRON_BLOCK,
-					BlockLegacyIds::GOLD_BLOCK,
-					BlockLegacyIds::DIAMOND_BLOCK,
-					BlockLegacyIds::EMERALD_BLOCK
-					//TODO netherite block
-				];
-				if(!in_array($block->getId(), $allowedBlockId, true)){
+				$block = $world->getBlock($pos->add($x, 0, $z));
+				if(!isset(self::ALLOWED_BLOCK_IDS[$block->getId()])){
 					return false;
 				}
 			}
@@ -119,8 +190,11 @@ public function isBeaconLevelValid(int $level) : bool{
 	}
 
 	public function viewSky() : bool{
-		for($y = 0; $y <= $this->position->getWorld()->getMaxY() - $this->position->getFloorY(); $y++){
-			$block = $this->position->getWorld()->getBlock($this->position->add(0, $y, 0));
+		$world = $this->position->getWorld();
+		$maxY = $world->getMaxY();
+		$block = $this;
+		for($y = 0; $y <= $maxY; $y++){
+			$block = $world->getBlock($block->position->up());
 			if(!$block instanceof Transparent && !$block instanceof Bedrock){
 				return false;
 			}

src/network/mcpe/handler/InGamePacketHandler.php

@@ -26,7 +26,6 @@
 use pocketmine\block\BaseSign;
 use pocketmine\block\Beacon;
 use pocketmine\block\ItemFrame;
-use pocketmine\block\tile\Beacon as TileBeacon;
 use pocketmine\block\utils\SignText;
 use pocketmine\entity\animation\ConsumingItemAnimation;
 use pocketmine\entity\InvalidSkinException;
@@ -637,16 +636,16 @@ public function handleBlockActorData(BlockActorDataPacket $packet) : bool{
 
 			$this->session->getLogger()->debug("Invalid sign update data: " . base64_encode($packet->nbt->getEncodedNbt()));
 		}elseif($block instanceof Beacon){
-			$id = $nbt->getTag("id");
-			if($id instanceof StringTag && $id->getValue() === "Beacon"){
-				$beaconTile = $this->player->getWorld()->getTileAt($nbt->getInt("x"), $nbt->getInt("y"), $nbt->getInt("z"));
-				if($beaconTile instanceof TileBeacon){
-					$beaconTile->setPrimaryEffect($nbt->getInt("primary"));
-					$beaconTile->setSecondaryEffect($nbt->getInt("secondary"));
-					$beaconTile->getPosition()->getWorld()->scheduleDelayedBlockUpdate($beaconTile->getPosition(), 20);
-				}
-				return true;
+			try{
+				$block->setPrimaryEffect($nbt->getInt("primary", 0));
+				$block->setSecondaryEffect($nbt->getInt("secondary", 0));
+			}catch(\InvalidArgumentException $e){
+				throw PacketHandlingException::wrap($e);
 			}
+			$world = $block->getPosition()->getWorld();
+			$world->setBlock($pos, $block);
+			$world->scheduleDelayedBlockUpdate($pos, 20);
+			return true;
 		}
 
 		return false;