From 169c55443a38e9e8a76fc91513d112a4749f18ce Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Mon, 16 Jun 2014 23:00:54 +0200
Subject: [PATCH] Fixed #1213

---
 src/pocketmine/item/DiamondAxe.php     |  2 +-
 src/pocketmine/item/DiamondHoe.php     |  2 +-
 src/pocketmine/item/DiamondPickaxe.php |  2 +-
 src/pocketmine/item/DiamondShovel.php  |  2 +-
 src/pocketmine/item/DiamondSword.php   |  2 +-
 src/pocketmine/item/FlintSteel.php     |  2 +-
 src/pocketmine/item/GoldAxe.php        |  2 +-
 src/pocketmine/item/GoldHoe.php        |  2 +-
 src/pocketmine/item/GoldPickaxe.php    |  2 +-
 src/pocketmine/item/GoldShovel.php     |  2 +-
 src/pocketmine/item/GoldSword.php      |  2 +-
 src/pocketmine/item/IronAxe.php        |  2 +-
 src/pocketmine/item/IronHoe.php        |  2 +-
 src/pocketmine/item/IronPickaxe.php    |  2 +-
 src/pocketmine/item/IronShovel.php     |  2 +-
 src/pocketmine/item/IronSword.php      | 30 ++++++++++++++++++++++++++
 src/pocketmine/item/Item.php           |  1 +
 src/pocketmine/item/StoneAxe.php       |  2 +-
 src/pocketmine/item/StoneHoe.php       |  2 +-
 src/pocketmine/item/StonePickaxe.php   |  2 +-
 src/pocketmine/item/StoneShovel.php    |  2 +-
 src/pocketmine/item/StoneSword.php     |  2 +-
 src/pocketmine/item/WoodenAxe.php      |  2 +-
 src/pocketmine/item/WoodenHoe.php      |  2 +-
 src/pocketmine/item/WoodenPickaxe.php  |  2 +-
 src/pocketmine/item/WoodenShovel.php   |  2 +-
 src/pocketmine/item/WoodenSword.php    |  2 +-
 27 files changed, 56 insertions(+), 25 deletions(-)
 create mode 100644 src/pocketmine/item/IronSword.php

diff --git a/src/pocketmine/item/DiamondAxe.php b/src/pocketmine/item/DiamondAxe.php
index 9ec10af27..300788e1a 100644
--- a/src/pocketmine/item/DiamondAxe.php
+++ b/src/pocketmine/item/DiamondAxe.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class DiamondAxe extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::DIAMOND_AXE, 0, $count, "Diamond Axe");
+		parent::__construct(self::DIAMOND_AXE, $meta, $count, "Diamond Axe");
 	}
 
 }
\ No newline at end of file
diff --git a/src/pocketmine/item/DiamondHoe.php b/src/pocketmine/item/DiamondHoe.php
index c9ed1fac8..1f9b69cfc 100644
--- a/src/pocketmine/item/DiamondHoe.php
+++ b/src/pocketmine/item/DiamondHoe.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class DiamondHoe extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::DIAMOND_HOE, 0, $count, "Diamond Hoe");
+		parent::__construct(self::DIAMOND_HOE, $meta, $count, "Diamond Hoe");
 	}
 
 }
\ No newline at end of file
diff --git a/src/pocketmine/item/DiamondPickaxe.php b/src/pocketmine/item/DiamondPickaxe.php
index 9ae507ee0..e75a3429c 100644
--- a/src/pocketmine/item/DiamondPickaxe.php
+++ b/src/pocketmine/item/DiamondPickaxe.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class DiamondPickaxe extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::DIAMOND_PICKAXE, 0, $count, "Diamond Pickaxe");
+		parent::__construct(self::DIAMOND_PICKAXE, $meta, $count, "Diamond Pickaxe");
 	}
 
 }
diff --git a/src/pocketmine/item/DiamondShovel.php b/src/pocketmine/item/DiamondShovel.php
index 52eebbee6..c0b41697b 100644
--- a/src/pocketmine/item/DiamondShovel.php
+++ b/src/pocketmine/item/DiamondShovel.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class DiamondShovel extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::DIAMOND_SHOVEL, 0, $count, "Diamond Shovel");
+		parent::__construct(self::DIAMOND_SHOVEL, $meta, $count, "Diamond Shovel");
 	}
 
 }
diff --git a/src/pocketmine/item/DiamondSword.php b/src/pocketmine/item/DiamondSword.php
index 22de5b8a2..fb0a5345d 100644
--- a/src/pocketmine/item/DiamondSword.php
+++ b/src/pocketmine/item/DiamondSword.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class DiamondSword extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::DIAMOND_SWORD, 0, $count, "Diamond Sword");
+		parent::__construct(self::DIAMOND_SWORD, $meta, $count, "Diamond Sword");
 	}
 
 }
diff --git a/src/pocketmine/item/FlintSteel.php b/src/pocketmine/item/FlintSteel.php
index d57305642..05ab82abc 100644
--- a/src/pocketmine/item/FlintSteel.php
+++ b/src/pocketmine/item/FlintSteel.php
@@ -35,7 +35,7 @@ class FlintSteel extends Tool{
 
 	public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
 		if(($player->gamemode & 0x01) === 0 and $this->useOn($block) and $this->getDamage() >= $this->getMaxDurability()){
-			$player->setSlot($player->getCurrentEquipment(), new Item(Item::AIR, 0, 0));
+			$player->getInventory()->setItemInHand(new Item(Item::AIR, 0, 0));
 		}
 
 		if($block->getID() === self::AIR and ($target instanceof Solid)){
diff --git a/src/pocketmine/item/GoldAxe.php b/src/pocketmine/item/GoldAxe.php
index 35998e2df..b12fbd8e1 100644
--- a/src/pocketmine/item/GoldAxe.php
+++ b/src/pocketmine/item/GoldAxe.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class GoldAxe extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::GOLD_AXE, 0, $count, "Gold Axe");
+		parent::__construct(self::GOLD_AXE, $meta, $count, "Gold Axe");
 	}
 
 }
\ No newline at end of file
diff --git a/src/pocketmine/item/GoldHoe.php b/src/pocketmine/item/GoldHoe.php
index 402df9435..3213d0145 100644
--- a/src/pocketmine/item/GoldHoe.php
+++ b/src/pocketmine/item/GoldHoe.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class GoldHoe extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::GOLD_HOE, 0, $count, "Gold Hoe");
+		parent::__construct(self::GOLD_HOE, $meta, $count, "Gold Hoe");
 	}
 
 }
\ No newline at end of file
diff --git a/src/pocketmine/item/GoldPickaxe.php b/src/pocketmine/item/GoldPickaxe.php
index 8b66bc9bf..b6cade921 100644
--- a/src/pocketmine/item/GoldPickaxe.php
+++ b/src/pocketmine/item/GoldPickaxe.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class GoldPickaxe extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::GOLD_PICKAXE, 0, $count, "Gold Pickaxe");
+		parent::__construct(self::GOLD_PICKAXE, $meta, $count, "Gold Pickaxe");
 	}
 
 }
diff --git a/src/pocketmine/item/GoldShovel.php b/src/pocketmine/item/GoldShovel.php
index b5e6cb5e7..c2e9b4fd9 100644
--- a/src/pocketmine/item/GoldShovel.php
+++ b/src/pocketmine/item/GoldShovel.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class GoldShovel extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::GOLD_SHOVEL, 0, $count, "Gold Shovel");
+		parent::__construct(self::GOLD_SHOVEL, $meta, $count, "Gold Shovel");
 	}
 
 }
diff --git a/src/pocketmine/item/GoldSword.php b/src/pocketmine/item/GoldSword.php
index a04ea1de3..0004d1769 100644
--- a/src/pocketmine/item/GoldSword.php
+++ b/src/pocketmine/item/GoldSword.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class GoldSword extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::GOLD_SWORD, 0, $count, "Gold Sword");
+		parent::__construct(self::GOLD_SWORD, $meta, $count, "Gold Sword");
 	}
 
 }
diff --git a/src/pocketmine/item/IronAxe.php b/src/pocketmine/item/IronAxe.php
index 602f28682..b9d356c62 100644
--- a/src/pocketmine/item/IronAxe.php
+++ b/src/pocketmine/item/IronAxe.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class IronAxe extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::IRON_AXE, 0, $count, "Iron Axe");
+		parent::__construct(self::IRON_AXE, $meta, $count, "Iron Axe");
 	}
 
 }
\ No newline at end of file
diff --git a/src/pocketmine/item/IronHoe.php b/src/pocketmine/item/IronHoe.php
index aab74eefb..982b5a1f2 100644
--- a/src/pocketmine/item/IronHoe.php
+++ b/src/pocketmine/item/IronHoe.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class IronHoe extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::IRON_HOE, 0, $count, "Iron Hoe");
+		parent::__construct(self::IRON_HOE, $meta, $count, "Iron Hoe");
 	}
 
 }
\ No newline at end of file
diff --git a/src/pocketmine/item/IronPickaxe.php b/src/pocketmine/item/IronPickaxe.php
index 0988c12d8..5aea9973b 100644
--- a/src/pocketmine/item/IronPickaxe.php
+++ b/src/pocketmine/item/IronPickaxe.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class IronPickaxe extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::IRON_PICKAXE, 0, $count, "Iron Pickaxe");
+		parent::__construct(self::IRON_PICKAXE, $meta, $count, "Iron Pickaxe");
 	}
 
 }
\ No newline at end of file
diff --git a/src/pocketmine/item/IronShovel.php b/src/pocketmine/item/IronShovel.php
index be9883a04..4a22ba04f 100644
--- a/src/pocketmine/item/IronShovel.php
+++ b/src/pocketmine/item/IronShovel.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class IronShovel extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::IRON_SHOVEL, 0, $count, "Iron Shovel");
+		parent::__construct(self::IRON_SHOVEL, $meta, $count, "Iron Shovel");
 	}
 
 }
\ No newline at end of file
diff --git a/src/pocketmine/item/IronSword.php b/src/pocketmine/item/IronSword.php
new file mode 100644
index 000000000..cac2bd730
--- /dev/null
+++ b/src/pocketmine/item/IronSword.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+namespace pocketmine\item;
+
+
+class IronSword extends Tool{
+	public function __construct($meta = 0, $count = 1){
+		parent::__construct(self::IRON_SWORD, $meta, $count, "Iron Sword");
+	}
+
+}
\ No newline at end of file
diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php
index c69524b63..d47cae100 100644
--- a/src/pocketmine/item/Item.php
+++ b/src/pocketmine/item/Item.php
@@ -412,6 +412,7 @@ class Item{
 				self::BOWL => new Bowl(),
 				self::FEATHER => new Feather(),
 				self::BRICK => new Brick(),
+				self::IRON_SWORD => new IronSword(),
 				self::IRON_INGOT => new IronIngot(),
 				self::GOLD_INGOT => new GoldIngot(),
 				self::IRON_SHOVEL => new IronShovel(),
diff --git a/src/pocketmine/item/StoneAxe.php b/src/pocketmine/item/StoneAxe.php
index 71ae4ddba..986287b07 100644
--- a/src/pocketmine/item/StoneAxe.php
+++ b/src/pocketmine/item/StoneAxe.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class StoneAxe extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::STONE_AXE, 0, $count, "Stone Axe");
+		parent::__construct(self::STONE_AXE, $meta, $count, "Stone Axe");
 	}
 
 }
\ No newline at end of file
diff --git a/src/pocketmine/item/StoneHoe.php b/src/pocketmine/item/StoneHoe.php
index 099f9f4db..f8854d728 100644
--- a/src/pocketmine/item/StoneHoe.php
+++ b/src/pocketmine/item/StoneHoe.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class StoneHoe extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::STONE_HOE, 0, $count, "Stone Hoe");
+		parent::__construct(self::STONE_HOE, $meta, $count, "Stone Hoe");
 	}
 
 }
\ No newline at end of file
diff --git a/src/pocketmine/item/StonePickaxe.php b/src/pocketmine/item/StonePickaxe.php
index a4ec9dbea..a87641c69 100644
--- a/src/pocketmine/item/StonePickaxe.php
+++ b/src/pocketmine/item/StonePickaxe.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class StonePickaxe extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::STONE_PICKAXE, 0, $count, "Stone Pickaxe");
+		parent::__construct(self::STONE_PICKAXE, $meta, $count, "Stone Pickaxe");
 	}
 
 }
diff --git a/src/pocketmine/item/StoneShovel.php b/src/pocketmine/item/StoneShovel.php
index bdc2e8ad2..d836892c2 100644
--- a/src/pocketmine/item/StoneShovel.php
+++ b/src/pocketmine/item/StoneShovel.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class StoneShovel extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::STONE_SHOVEL, 0, $count, "Stone Shovel");
+		parent::__construct(self::STONE_SHOVEL, $meta, $count, "Stone Shovel");
 	}
 
 }
diff --git a/src/pocketmine/item/StoneSword.php b/src/pocketmine/item/StoneSword.php
index 78cd77df0..583289163 100644
--- a/src/pocketmine/item/StoneSword.php
+++ b/src/pocketmine/item/StoneSword.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class StoneSword extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::STONE_SWORD, 0, $count, "Stone Sword");
+		parent::__construct(self::STONE_SWORD, $meta, $count, "Stone Sword");
 	}
 
 }
diff --git a/src/pocketmine/item/WoodenAxe.php b/src/pocketmine/item/WoodenAxe.php
index dabcecd83..b1ec05983 100644
--- a/src/pocketmine/item/WoodenAxe.php
+++ b/src/pocketmine/item/WoodenAxe.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class WoodenAxe extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::WOODEN_AXE, 0, $count, "Wooden Axe");
+		parent::__construct(self::WOODEN_AXE, $meta, $count, "Wooden Axe");
 	}
 
 }
diff --git a/src/pocketmine/item/WoodenHoe.php b/src/pocketmine/item/WoodenHoe.php
index d1540f0dd..506f287b6 100644
--- a/src/pocketmine/item/WoodenHoe.php
+++ b/src/pocketmine/item/WoodenHoe.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class WoodenHoe extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::WOODEN_HOE, 0, $count, "Wooden Hoe");
+		parent::__construct(self::WOODEN_HOE, $meta, $count, "Wooden Hoe");
 	}
 
 }
\ No newline at end of file
diff --git a/src/pocketmine/item/WoodenPickaxe.php b/src/pocketmine/item/WoodenPickaxe.php
index 4e316b76e..2c288d18d 100644
--- a/src/pocketmine/item/WoodenPickaxe.php
+++ b/src/pocketmine/item/WoodenPickaxe.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class WoodenPickaxe extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::WOODEN_PICKAXE, 0, $count, "Wooden Pickaxe");
+		parent::__construct(self::WOODEN_PICKAXE, $meta, $count, "Wooden Pickaxe");
 	}
 
 }
diff --git a/src/pocketmine/item/WoodenShovel.php b/src/pocketmine/item/WoodenShovel.php
index 6c9613990..8e83ef1d6 100644
--- a/src/pocketmine/item/WoodenShovel.php
+++ b/src/pocketmine/item/WoodenShovel.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class WoodenShovel extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::WOODEN_SHOVEL, 0, $count, "Wooden Shovel");
+		parent::__construct(self::WOODEN_SHOVEL, $meta, $count, "Wooden Shovel");
 	}
 
 }
diff --git a/src/pocketmine/item/WoodenSword.php b/src/pocketmine/item/WoodenSword.php
index 910492b6c..2fbe9cd6c 100644
--- a/src/pocketmine/item/WoodenSword.php
+++ b/src/pocketmine/item/WoodenSword.php
@@ -24,7 +24,7 @@ namespace pocketmine\item;
 
 class WoodenSword extends Tool{
 	public function __construct($meta = 0, $count = 1){
-		parent::__construct(self::WOODEN_SWORD, 0, $count, "Wooden Sword");
+		parent::__construct(self::WOODEN_SWORD, $meta, $count, "Wooden Sword");
 	}
 
 }