diff options
| author | Franklin Kong <franklintigerkong@gmail.com> | 2020-06-26 22:34:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-26 22:34:22 +0200 |
| commit | 868e28b44f1ad0b5bb2585e156407915803ab3e2 (patch) | |
| tree | 00ab24eb4242072c8bada538b8904b6e3786d351 /src/Items/ItemHandler.cpp | |
| parent | Cactus cannot be placed on a forbidden blocks (#4767) (diff) | |
| download | cuberite-868e28b44f1ad0b5bb2585e156407915803ab3e2.tar cuberite-868e28b44f1ad0b5bb2585e156407915803ab3e2.tar.gz cuberite-868e28b44f1ad0b5bb2585e156407915803ab3e2.tar.bz2 cuberite-868e28b44f1ad0b5bb2585e156407915803ab3e2.tar.lz cuberite-868e28b44f1ad0b5bb2585e156407915803ab3e2.tar.xz cuberite-868e28b44f1ad0b5bb2585e156407915803ab3e2.tar.zst cuberite-868e28b44f1ad0b5bb2585e156407915803ab3e2.zip | |
Diffstat (limited to 'src/Items/ItemHandler.cpp')
| -rw-r--r-- | src/Items/ItemHandler.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp index c014ba794..79a0dbcb9 100644 --- a/src/Items/ItemHandler.cpp +++ b/src/Items/ItemHandler.cpp @@ -15,10 +15,7 @@ #include "ItemBoat.h" #include "ItemBottle.h" #include "ItemBow.h" -#include "ItemBrewingStand.h" #include "ItemBucket.h" -#include "ItemCake.h" -#include "ItemCauldron.h" #include "ItemChest.h" #include "ItemCloth.h" #include "ItemComparator.h" @@ -28,7 +25,6 @@ #include "ItemEmptyMap.h" #include "ItemEyeOfEnder.h" #include "ItemFishingRod.h" -#include "ItemFlowerPot.h" #include "ItemFood.h" #include "ItemFoodSeeds.h" #include "ItemGoldenApple.h" @@ -61,12 +57,11 @@ #include "ItemSoup.h" #include "ItemSpawnEgg.h" #include "ItemSpiderEye.h" -#include "ItemString.h" -#include "ItemSugarcane.h" #include "ItemSword.h" #include "ItemThrowable.h" #include "../Blocks/BlockHandler.h" +#include "SimplePlaceableItemHandler.h" @@ -132,9 +127,9 @@ cItemHandler * cItemHandler::CreateItemHandler(int a_ItemType) case E_ITEM_BED: return new cItemBedHandler(a_ItemType); case E_ITEM_BOTTLE_O_ENCHANTING: return new cItemBottleOEnchantingHandler(); case E_ITEM_BOW: return new cItemBowHandler(); - case E_ITEM_BREWING_STAND: return new cItemBrewingStandHandler(a_ItemType); - case E_ITEM_CAKE: return new cItemCakeHandler(a_ItemType); - case E_ITEM_CAULDRON: return new cItemCauldronHandler(a_ItemType); + case E_ITEM_BREWING_STAND: return new cSimplePlaceableItemHandler(a_ItemType, E_BLOCK_BREWING_STAND); + case E_ITEM_CAKE: return new cSimplePlaceableItemHandler(a_ItemType, E_BLOCK_CAKE); + case E_ITEM_CAULDRON: return new cSimplePlaceableItemHandler(a_ItemType, E_BLOCK_CAULDRON); case E_ITEM_COMPARATOR: return new cItemComparatorHandler(a_ItemType); case E_ITEM_DYE: return new cItemDyeHandler(a_ItemType); case E_ITEM_EGG: return new cItemEggHandler(); @@ -145,7 +140,7 @@ cItemHandler * cItemHandler::CreateItemHandler(int a_ItemType) case E_ITEM_FIREWORK_ROCKET: return new cItemFireworkHandler(); case E_ITEM_FISHING_ROD: return new cItemFishingRodHandler(a_ItemType); case E_ITEM_FLINT_AND_STEEL: return new cItemLighterHandler(a_ItemType); - case E_ITEM_FLOWER_POT: return new cItemFlowerPotHandler(a_ItemType); + case E_ITEM_FLOWER_POT: return new cSimplePlaceableItemHandler(a_ItemType, E_BLOCK_FLOWER_POT); case E_ITEM_GLASS_BOTTLE: return new cItemBottleHandler(); case E_ITEM_MAP: return new cItemMapHandler(); case E_ITEM_MILK: return new cItemMilkHandler(); @@ -160,8 +155,8 @@ cItemHandler * cItemHandler::CreateItemHandler(int a_ItemType) case E_ITEM_HEAD: return new cItemMobHeadHandler(a_ItemType); case E_ITEM_SNOWBALL: return new cItemSnowballHandler(); case E_ITEM_SPAWN_EGG: return new cItemSpawnEggHandler(a_ItemType); - case E_ITEM_STRING: return new cItemStringHandler(a_ItemType); - case E_ITEM_SUGARCANE: return new cItemSugarcaneHandler(a_ItemType); + case E_ITEM_STRING: return new cSimplePlaceableItemHandler(a_ItemType, E_BLOCK_TRIPWIRE); + case E_ITEM_SUGARCANE: return new cSimplePlaceableItemHandler(a_ItemType, E_BLOCK_SUGARCANE); case E_ITEM_WOODEN_HOE: case E_ITEM_STONE_HOE: |