From be70121f3a8f4d48eeab2f625ffa8864e66b25b9 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Thu, 28 Aug 2014 22:28:32 +0200
Subject: [PATCH] Renamed Item\Block to Item\ItemBlock

---
 src/pocketmine/item/Item.php                     | 1 -
 src/pocketmine/item/{Block.php => ItemBlock.php} | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)
 rename src/pocketmine/item/{Block.php => ItemBlock.php} (89%)

diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php
index a6035ea27..d7cdd9e18 100644
--- a/src/pocketmine/item/Item.php
+++ b/src/pocketmine/item/Item.php
@@ -27,7 +27,6 @@ namespace pocketmine\item;
 use pocketmine\block\Block;
 use pocketmine\entity\Entity;
 use pocketmine\inventory\Fuel;
-use pocketmine\item\Block as ItemBlock;
 use pocketmine\level\Level;
 use pocketmine\Player;
 
diff --git a/src/pocketmine/item/Block.php b/src/pocketmine/item/ItemBlock.php
similarity index 89%
rename from src/pocketmine/item/Block.php
rename to src/pocketmine/item/ItemBlock.php
index 269b00e60..dba7bb9e3 100644
--- a/src/pocketmine/item/Block.php
+++ b/src/pocketmine/item/ItemBlock.php
@@ -21,13 +21,13 @@
 
 namespace pocketmine\item;
 
-use pocketmine\block\Block as BlockBlock;
+use pocketmine\block\Block;
 
 /**
  * Class used for Items that can be Blocks
  */
-class Block extends Item{
-	public function __construct(BlockBlock $block, $meta = 0, $count = 1){
+class ItemBlock extends Item{
+	public function __construct(Block $block, $meta = 0, $count = 1){
 		$this->block = clone $block;
 		parent::__construct($block->getID(), $block->getDamage(), $count, $block->getName());
 	}