From a2bb6a41d9eea5fdf4f23045116e3def76494e0b Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Sat, 6 Jul 2019 15:16:03 +0100
Subject: [PATCH] World: some cleanup to random blocktick registry

---
 src/pocketmine/world/World.php | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/pocketmine/world/World.php b/src/pocketmine/world/World.php
index c4bedd673..d0d93e5f3 100644
--- a/src/pocketmine/world/World.php
+++ b/src/pocketmine/world/World.php
@@ -235,8 +235,8 @@ class World implements ChunkManager{
 	private $chunkTickRadius;
 	/** @var int */
 	private $chunksPerTick;
-	/** @var \SplFixedArray<bool> */
-	private $randomTickBlocks = null;
+	/** @var bool[] */
+	private $randomTickBlocks = [];
 
 	/** @var WorldTimings */
 	public $timings;
@@ -370,17 +370,9 @@ class World implements ChunkManager{
 
 		$dontTickBlocks = array_fill_keys($this->server->getProperty("chunk-ticking.disable-block-ticking", []), true);
 
-		$this->randomTickBlocks = new \SplFixedArray(16384);
-		foreach($this->randomTickBlocks as $i => $null){
-			$id = $i >> 4;
-			$meta = $i & 0xf;
-			try{
-				$block = BlockFactory::get($id, $meta); //Make sure it's a copy
-			}catch(\InvalidArgumentException $e){
-				continue;
-			}
-			if(!isset($dontTickBlocks[$id]) and $block->ticksRandomly()){
-				$this->randomTickBlocks[($id << 4) | $meta] = true;
+		foreach(BlockFactory::getAllKnownStates() as $state){
+			if(!isset($dontTickBlocks[$state->getId()]) and $state->ticksRandomly()){
+				$this->randomTickBlocks[$state->getFullId()] = true;
 			}
 		}
 
@@ -932,7 +924,10 @@ class World implements ChunkManager{
 		}
 	}
 
-	public function getRandomTickedBlocks() : \SplFixedArray{
+	/**
+	 * @return bool[] fullID => bool
+	 */
+	public function getRandomTickedBlocks() : array{
 		return $this->randomTickBlocks;
 	}
 
@@ -945,7 +940,7 @@ class World implements ChunkManager{
 	}
 
 	public function removeRandomTickedBlock(int $id, int $variant = 0){
-		$this->randomTickBlocks[($id << 4) | $variant] = null;
+		unset($this->randomTickBlocks[($id << 4) | $variant]);
 	}
 
 	private function tickChunks(){
@@ -1002,7 +997,7 @@ class World implements ChunkManager{
 
 						$state = $subChunk->getFullBlock($x, $y, $z);
 
-						if($this->randomTickBlocks[$state]){
+						if(isset($this->randomTickBlocks[$state])){
 							/** @var Block $block */
 							$block = BlockFactory::fromFullBlock($state, $this->temporalPosition->setComponents(
 								$chunkX * 16 + $x,