From 48a5eeb3a459cb90b302990d3f243a34b0bb7da0 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Wed, 19 Sep 2018 15:06:58 +0100
Subject: [PATCH] BlockFactory: remove some useless static arrays

---
 src/pocketmine/block/BlockFactory.php | 12 ------------
 src/pocketmine/level/Level.php        |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/pocketmine/block/BlockFactory.php b/src/pocketmine/block/BlockFactory.php
index b5dee4f42..6874db58e 100644
--- a/src/pocketmine/block/BlockFactory.php
+++ b/src/pocketmine/block/BlockFactory.php
@@ -35,12 +35,6 @@ class BlockFactory{
 
 	/** @var \SplFixedArray<bool> */
 	public static $solid = null;
-	/** @var \SplFixedArray<bool> */
-	public static $transparent = null;
-	/** @var \SplFixedArray<float> */
-	public static $hardness = null;
-	/** @var \SplFixedArray<int> */
-	public static $light = null;
 	/** @var \SplFixedArray<int> */
 	public static $lightFilter = null;
 	/** @var \SplFixedArray<bool> */
@@ -64,11 +58,8 @@ class BlockFactory{
 	public static function init() : void{
 		self::$fullList = new \SplFixedArray(4096);
 
-		self::$light = new \SplFixedArray(256);
 		self::$lightFilter = new \SplFixedArray(256);
 		self::$solid = new \SplFixedArray(256);
-		self::$hardness = new \SplFixedArray(256);
-		self::$transparent = new \SplFixedArray(256);
 		self::$diffusesSkyLight = new \SplFixedArray(256);
 		self::$blastResistance = new \SplFixedArray(256);
 
@@ -357,9 +348,6 @@ class BlockFactory{
 		}
 
 		self::$solid[$id] = $block->isSolid();
-		self::$transparent[$id] = $block->isTransparent();
-		self::$hardness[$id] = $block->getHardness();
-		self::$light[$id] = $block->getLightLevel();
 		self::$lightFilter[$id] = min(15, $block->getLightFilter() + 1); //opacity plus 1 standard light filter
 		self::$diffusesSkyLight[$id] = $block->diffusesSkyLight();
 		self::$blastResistance[$id] = $block->getBlastResistance();
diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
index 3e27ab498..6bee97008 100644
--- a/src/pocketmine/level/Level.php
+++ b/src/pocketmine/level/Level.php
@@ -1463,8 +1463,8 @@ class Level implements ChunkManager, Metadatable{
 	public function updateBlockLight(int $x, int $y, int $z){
 		$this->timings->doBlockLightUpdates->startTiming();
 
-		$id = $this->getBlockIdAt($x, $y, $z);
-		$newLevel = max(BlockFactory::$light[$id], $this->getHighestAdjacentBlockLight($x, $y, $z) - BlockFactory::$lightFilter[$id]);
+		$block = $this->getBlockAt($x, $y, $z);
+		$newLevel = max($block->getLightLevel(), $this->getHighestAdjacentBlockLight($x, $y, $z) - $block->getLightFilter());
 
 		if($this->blockLightUpdate === null){
 			$this->blockLightUpdate = new BlockLightUpdate($this);