mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-30 15:19:56 +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

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

@ -2,11 +2,11 @@
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* 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
@ -540,7 +540,7 @@ class Item{
self::$list[self::RAW_FISH] = Fish::class;
self::$list[self::COOKED_FISH] = CookedFish::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::WHEAT] = Wheat::class;
self::$list[self::BREAD] = Bread::class;
@ -583,7 +583,7 @@ class Item{
}
}
}
self::initCreativeItems();
}
@ -992,7 +992,7 @@ class Item{
$this->name = $this->block->getName();
}
}
public function setCompoundTag($tags){
if($tags instanceof Compound){
$this->setNamedTag($tags);
@ -1000,7 +1000,7 @@ class Item{
$this->tags = $tags;
$this->cachedNBT = null;
}
return $this;
}
@ -1010,7 +1010,7 @@ class Item{
public function getCompoundTag(){
return $this->tags;
}
public function hasCompoundTag(){
return $this->tags !== "" and $this->tags !== null;
}
@ -1244,7 +1244,7 @@ class Item{
return null;
}
public function getNamedTag(){
if(!$this->hasCompoundTag()){
return null;

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

@ -2,11 +2,11 @@
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* 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
@ -15,13 +15,13 @@
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*
*/
namespace pocketmine\item;
class String extends Item{
class StringItem extends Item{
public function __construct($meta = 0, $count = 1){
parent::__construct(self::STRING, $meta, $count, "String");
}