mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 17:59:48 +00:00
Code Issues Projects Releases Wiki Activity

Fixed fix for flowers, removed corrupted flower state, added proper identifiers that do not collide, added remaining IDs everywhere for consistency, removed magic number for constants, closes #3058

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-05-23 22:49:06 +02:00
parent f91a3a2666
commit c4d63326be
3 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@
namespace pocketmine\item;
use pocketmine\block\Block;
use pocketmine\block\Flower;
use pocketmine\entity\Entity;
use pocketmine\entity\Squid;
use pocketmine\entity\Villager;
@ -78,6 +79,8 @@ class Item{
const DEAD_BUSH = 32;
const WOOL = 35;
const DANDELION = 37;
const POPPY = 38;
const ROSE = 38;
const RED_FLOWER = 38;
const BROWN_MUSHROOM = 39;
const RED_MUSHROOM = 40;
@ -643,15 +646,15 @@ class Item{
self::addCreativeItem(Item::get(Item::FURNACE, 0));
self::addCreativeItem(Item::get(Item::END_PORTAL, 0));
self::addCreativeItem(Item::get(Item::DANDELION, 0));
self::addCreativeItem(Item::get(Item::RED_FLOWER, 0));
self::addCreativeItem(Item::get(Item::RED_FLOWER, 1));
self::addCreativeItem(Item::get(Item::RED_FLOWER, 2));
self::addCreativeItem(Item::get(Item::RED_FLOWER, 3));
self::addCreativeItem(Item::get(Item::RED_FLOWER, 4));
self::addCreativeItem(Item::get(Item::RED_FLOWER, 5));
self::addCreativeItem(Item::get(Item::RED_FLOWER, 6));
self::addCreativeItem(Item::get(Item::RED_FLOWER, 7));
self::addCreativeItem(Item::get(Item::RED_FLOWER, 8));
self::addCreativeItem(Item::get(Item::RED_FLOWER, Flower::TYPE_POPPY));
self::addCreativeItem(Item::get(Item::RED_FLOWER, Flower::TYPE_BLUE_ORCHID));
self::addCreativeItem(Item::get(Item::RED_FLOWER, Flower::TYPE_ALLIUM));
self::addCreativeItem(Item::get(Item::RED_FLOWER, Flower::TYPE_AZURE_BLUET));
self::addCreativeItem(Item::get(Item::RED_FLOWER, Flower::TYPE_RED_TULIP));
self::addCreativeItem(Item::get(Item::RED_FLOWER, Flower::TYPE_ORANGE_TULIP));
self::addCreativeItem(Item::get(Item::RED_FLOWER, Flower::TYPE_WHITE_TULIP));
self::addCreativeItem(Item::get(Item::RED_FLOWER, Flower::TYPE_PINK_TULIP));
self::addCreativeItem(Item::get(Item::RED_FLOWER, Flower::TYPE_OXEYE_DAISY));
//TODO: Lilac
//TODO: Double Tallgrass
//TODO: Large Fern