From f671da99a626b9f50b8fe38339c1a32752136671 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Fri, 12 Oct 2018 21:40:45 +0100
Subject: [PATCH] BlockFactory: fix failing test

---
 src/pocketmine/block/BlockFactory.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pocketmine/block/BlockFactory.php b/src/pocketmine/block/BlockFactory.php
index 539f4de08..9fd5c8625 100644
--- a/src/pocketmine/block/BlockFactory.php
+++ b/src/pocketmine/block/BlockFactory.php
@@ -464,6 +464,9 @@ class BlockFactory{
 			throw new \InvalidArgumentException("Block variant collides with state bitmask");
 		}
 
+		if(!$override and self::isRegistered($id, $variant)){
+			throw new \InvalidArgumentException("Block registration conflicts with an existing block");
+		}
 		self::fillStaticArrays(($id << 4) | $variant, $block); //register default state mapped to variant, for blocks which don't use 0 as valid state
 
 		for($m = $variant + 1; $m <= ($variant | $stateMask); ++$m){