mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-30 23:29:54 +00:00
Code Issues Projects Releases Wiki Activity

Fixed string class conflict

Browse Source
This commit is contained in:
PEMapModder 2015-10-02 01:52:10 +08:00
parent 6013213159
commit cc8eca3084
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/item/Item.php
View File

@ -540,7 +540,7 @@ class Item{
self::$list[self::RAW_FISH] = Fish::class; self::$list[self::RAW_FISH] = Fish::class;
self::$list[self::COOKED_FISH] = CookedFish::class; self::$list[self::COOKED_FISH] = CookedFish::class;
self::$list[self::ARROW] = Arrow::class; self::$list[self::ARROW] = Arrow::class;
self::$list[self::STRING] = String::class; self::$list[self::STRING] = StringItem::class;
self::$list[self::GUNPOWDER] = Gunpowder::class; self::$list[self::GUNPOWDER] = Gunpowder::class;
self::$list[self::WHEAT] = Wheat::class; self::$list[self::WHEAT] = Wheat::class;
self::$list[self::BREAD] = Bread::class; self::$list[self::BREAD] = Bread::class;

2
src/pocketmine/item/String.php → src/pocketmine/item/StringItem.php
View File

@ -21,7 +21,7 @@
namespace pocketmine\item; namespace pocketmine\item;
class String extends Item{ class StringItem extends Item{
public function __construct($meta = 0, $count = 1){ public function __construct($meta = 0, $count = 1){
parent::__construct(self::STRING, $meta, $count, "String"); parent::__construct(self::STRING, $meta, $count, "String");
} }