Particle::encode() now always returns ClientboundPacket[]

src/world/World.php

@@ -493,9 +493,6 @@ class World implements ChunkManager{
 	 */
 	public function addParticle(Vector3 $pos, Particle $particle, ?array $players = null) : void{
 		$pk = $particle->encode($pos);
-		if(!is_array($pk)){
-			$pk = [$pk];
-		}
 		if(count($pk) > 0){
 			if($players === null){
 				foreach($pk as $e){

src/world/particle/AngryVillagerParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class AngryVillagerParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::VILLAGER_ANGRY, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::VILLAGER_ANGRY, 0, $pos)];
 	}
 }

src/world/particle/BlockForceFieldParticle.php

@@ -36,7 +36,7 @@ class BlockForceFieldParticle implements Particle{
 		$this->data = $data; //TODO: proper encode/decode of data
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::BLOCK_FORCE_FIELD, $this->data, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::BLOCK_FORCE_FIELD, $this->data, $pos)];
 	}
 }

src/world/particle/BlockPunchParticle.php

@@ -43,7 +43,7 @@ class BlockPunchParticle implements Particle{
 		$this->face = $face;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::create(LevelEventPacket::EVENT_PARTICLE_PUNCH_BLOCK, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()) | ($this->face << 24), $pos);
+		return [LevelEventPacket::create(LevelEventPacket::EVENT_PARTICLE_PUNCH_BLOCK, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()) | ($this->face << 24), $pos)];
 	}
 }

src/world/particle/BubbleParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class BubbleParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::BUBBLE, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::BUBBLE, 0, $pos)];
 	}
 }

src/world/particle/CriticalParticle.php

@@ -35,7 +35,7 @@ class CriticalParticle implements Particle{
 		$this->scale = $scale;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::CRITICAL, $this->scale, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::CRITICAL, $this->scale, $pos)];
 	}
 }

src/world/particle/DestroyBlockParticle.php

@@ -37,7 +37,7 @@ class DestroyBlockParticle implements Particle{
 		$this->block = $b;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::create(LevelEventPacket::EVENT_PARTICLE_DESTROY, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()), $pos);
+		return [LevelEventPacket::create(LevelEventPacket::EVENT_PARTICLE_DESTROY, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()), $pos)];
 	}
 }

src/world/particle/DragonEggTeleportParticle.php

@@ -49,7 +49,7 @@ class DragonEggTeleportParticle implements Particle{
 		return $v;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
 		$data = ($this->zDiff < 0 ? 1 << 26 : 0) |
 			($this->yDiff < 0 ? 1 << 25 : 0) |
 			($this->xDiff < 0 ? 1 << 24 : 0) |
@@ -57,6 +57,6 @@ class DragonEggTeleportParticle implements Particle{
 			(abs($this->yDiff) << 8) |
 			abs($this->zDiff);
 
-		return LevelEventPacket::create(LevelEventPacket::EVENT_PARTICLE_DRAGON_EGG_TELEPORT, $data, $pos);
+		return [LevelEventPacket::create(LevelEventPacket::EVENT_PARTICLE_DRAGON_EGG_TELEPORT, $data, $pos)];
 	}
 }

src/world/particle/DustParticle.php

@@ -36,7 +36,7 @@ class DustParticle implements Particle{
 		$this->color = $color;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::DUST, $this->color->toARGB(), $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::DUST, $this->color->toARGB(), $pos)];
 	}
 }

src/world/particle/EnchantParticle.php

@@ -37,7 +37,7 @@ class EnchantParticle implements Particle{
 		$this->color = $color;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::MOB_SPELL, $this->color->toARGB(), $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::MOB_SPELL, $this->color->toARGB(), $pos)];
 	}
 }

src/world/particle/EnchantmentTableParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class EnchantmentTableParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::ENCHANTMENT_TABLE, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::ENCHANTMENT_TABLE, 0, $pos)];
 	}
 }

src/world/particle/EndermanTeleportParticle.php

@@ -28,7 +28,7 @@ use pocketmine\network\mcpe\protocol\LevelEventPacket;
 
 class EndermanTeleportParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::create(LevelEventPacket::EVENT_PARTICLE_ENDERMAN_TELEPORT, 0, $pos);
+		return [LevelEventPacket::create(LevelEventPacket::EVENT_PARTICLE_ENDERMAN_TELEPORT, 0, $pos)];
 	}
 }

src/world/particle/EntityFlameParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class EntityFlameParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::MOB_FLAME, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::MOB_FLAME, 0, $pos)];
 	}
 }

src/world/particle/ExplodeParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class ExplodeParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::EXPLODE, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::EXPLODE, 0, $pos)];
 	}
 }

src/world/particle/FlameParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class FlameParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::FLAME, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::FLAME, 0, $pos)];
 	}
 }

src/world/particle/FloatingTextParticle.php

@@ -80,7 +80,7 @@ class FloatingTextParticle implements Particle{
 		$this->invisible = $value;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
 		$p = [];
 
 		if($this->entityId === null){

src/world/particle/HappyVillagerParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class HappyVillagerParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::VILLAGER_HAPPY, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::VILLAGER_HAPPY, 0, $pos)];
 	}
 }

src/world/particle/HeartParticle.php

@@ -35,7 +35,7 @@ class HeartParticle implements Particle{
 		$this->scale = $scale;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::HEART, $this->scale, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::HEART, $this->scale, $pos)];
 	}
 }

src/world/particle/HugeExplodeParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class HugeExplodeParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::HUGE_EXPLODE, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::HUGE_EXPLODE, 0, $pos)];
 	}
 }

src/world/particle/HugeExplodeSeedParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class HugeExplodeSeedParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::HUGE_EXPLODE_SEED, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::HUGE_EXPLODE_SEED, 0, $pos)];
 	}
 }

src/world/particle/InkParticle.php

@@ -35,7 +35,7 @@ class InkParticle implements Particle{
 		$this->scale = $scale;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::INK, $this->scale, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::INK, $this->scale, $pos)];
 	}
 }

src/world/particle/InstantEnchantParticle.php

@@ -36,7 +36,7 @@ class InstantEnchantParticle implements Particle{
 		$this->color = $color;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::MOB_SPELL_INSTANTANEOUS, $this->color->toARGB(), $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::MOB_SPELL_INSTANTANEOUS, $this->color->toARGB(), $pos)];
 	}
 }

src/world/particle/ItemBreakParticle.php

@@ -36,7 +36,7 @@ class ItemBreakParticle implements Particle{
 		$this->item = $item;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::ITEM_BREAK, ($this->item->getId() << 16) | $this->item->getMeta(), $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::ITEM_BREAK, ($this->item->getId() << 16) | $this->item->getMeta(), $pos)];
 	}
 }

src/world/particle/LavaDripParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class LavaDripParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::DRIP_LAVA, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::DRIP_LAVA, 0, $pos)];
 	}
 }

src/world/particle/LavaParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class LavaParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::LAVA, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::LAVA, 0, $pos)];
 	}
 }

src/world/particle/MobSpawnParticle.php

@@ -38,7 +38,7 @@ class MobSpawnParticle implements Particle{
 		$this->height = $height;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::create(LevelEventPacket::EVENT_PARTICLE_SPAWN, ($this->width & 0xff) | (($this->height & 0xff) << 8), $pos);
+		return [LevelEventPacket::create(LevelEventPacket::EVENT_PARTICLE_SPAWN, ($this->width & 0xff) | (($this->height & 0xff) << 8), $pos)];
 	}
 }

src/world/particle/Particle.php

@@ -29,8 +29,8 @@ use pocketmine\network\mcpe\protocol\ClientboundPacket;
 interface Particle{
 
 	/**
-	 * @return ClientboundPacket|ClientboundPacket[]
+	 * @return ClientboundPacket[]
 	 */
-	public function encode(Vector3 $pos);
+	public function encode(Vector3 $pos) : array;
 
 }

src/world/particle/PortalParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class PortalParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::PORTAL, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::PORTAL, 0, $pos)];
 	}
 }

src/world/particle/PotionSplashParticle.php

@@ -49,7 +49,7 @@ class PotionSplashParticle implements Particle{
 		return $this->color;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::create(LevelEventPacket::EVENT_PARTICLE_SPLASH, $this->color->toARGB(), $pos);
+		return [LevelEventPacket::create(LevelEventPacket::EVENT_PARTICLE_SPLASH, $this->color->toARGB(), $pos)];
 	}
 }

src/world/particle/RainSplashParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class RainSplashParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::RAIN_SPLASH, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::RAIN_SPLASH, 0, $pos)];
 	}
 }

src/world/particle/RedstoneParticle.php

@@ -35,7 +35,7 @@ class RedstoneParticle implements Particle{
 		$this->lifetime = $lifetime;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::REDSTONE, $this->lifetime, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::REDSTONE, $this->lifetime, $pos)];
 	}
 }

src/world/particle/SmokeParticle.php

@@ -35,7 +35,7 @@ class SmokeParticle implements Particle{
 		$this->scale = $scale;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::SMOKE, $this->scale, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::SMOKE, $this->scale, $pos)];
 	}
 }

src/world/particle/SnowballPoofParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class SnowballPoofParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::SNOWBALL_POOF, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::SNOWBALL_POOF, 0, $pos)];
 	}
 }

src/world/particle/SplashParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class SplashParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::WATER_SPLASH, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::WATER_SPLASH, 0, $pos)];
 	}
 }

src/world/particle/SporeParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class SporeParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::TOWN_AURA, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::TOWN_AURA, 0, $pos)];
 	}
 }

src/world/particle/TerrainParticle.php

@@ -37,7 +37,7 @@ class TerrainParticle implements Particle{
 		$this->block = $b;
 	}
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::TERRAIN, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()), $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::TERRAIN, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()), $pos)];
 	}
 }

src/world/particle/WaterDripParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class WaterDripParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::DRIP_WATER, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::DRIP_WATER, 0, $pos)];
 	}
 }

src/world/particle/WaterParticle.php

@@ -29,7 +29,7 @@ use pocketmine\network\mcpe\protocol\types\ParticleIds;
 
 class WaterParticle implements Particle{
 
-	public function encode(Vector3 $pos){
+	public function encode(Vector3 $pos) : array{
-		return LevelEventPacket::standardParticle(ParticleIds::WATER_WAKE, 0, $pos);
+		return [LevelEventPacket::standardParticle(ParticleIds::WATER_WAKE, 0, $pos)];
 	}
 }