Merge remote-tracking branch 'origin/master' into mcpe-0.12

This commit is contained in:
Shoghi Cervantes
2015-08-12 15:00:04 +02:00
4 changed files with 15 additions and 8 deletions

View File

@ -24,10 +24,10 @@ namespace pocketmine\item;
class CookedFish extends Item{
public function __construct($meta = 0, $count = 1){
parent::__construct(self::RAW_FISH, $meta, $count, "Cooked Fish");
parent::__construct(self::COOKED_FISH, $meta, $count, "Cooked Fish");
if($this->meta === 1){
$this->name = "Cooked Salmon";
}
}
}
}