summaryrefslogtreecommitdiffstats
path: root/src/Items/ItemHandler.cpp
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-18 23:13:44 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-18 23:13:44 +0100
commita686656253b9bd11238b2ae2210f809b49c355b9 (patch)
tree112663e0d7be31401232bd6e3f4f10852776639e /src/Items/ItemHandler.cpp
parentMerge branch 'itemframes' of https://github.com/mc-server/MCServer into itemframes (diff)
parentMerge pull request #696 from mc-server/paintings (diff)
downloadcuberite-a686656253b9bd11238b2ae2210f809b49c355b9.tar
cuberite-a686656253b9bd11238b2ae2210f809b49c355b9.tar.gz
cuberite-a686656253b9bd11238b2ae2210f809b49c355b9.tar.bz2
cuberite-a686656253b9bd11238b2ae2210f809b49c355b9.tar.lz
cuberite-a686656253b9bd11238b2ae2210f809b49c355b9.tar.xz
cuberite-a686656253b9bd11238b2ae2210f809b49c355b9.tar.zst
cuberite-a686656253b9bd11238b2ae2210f809b49c355b9.zip
Diffstat (limited to '')
-rw-r--r--src/Items/ItemHandler.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index da1cd768d..945f84b9c 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -27,6 +27,7 @@
#include "ItemLighter.h"
#include "ItemMinecart.h"
#include "ItemNetherWart.h"
+#include "ItemPainting.h"
#include "ItemPickaxe.h"
#include "ItemThrowable.h"
#include "ItemRedstoneDust.h"
@@ -108,6 +109,7 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
case E_ITEM_FLOWER_POT: return new cItemFlowerPotHandler(a_ItemType);
case E_ITEM_ITEM_FRAME: return new cItemItemFrameHandler(a_ItemType);
case E_ITEM_NETHER_WART: return new cItemNetherWartHandler(a_ItemType);
+ case E_ITEM_PAINTING: return new cItemPaintingHandler(a_ItemType);
case E_ITEM_REDSTONE_DUST: return new cItemRedstoneDustHandler(a_ItemType);
case E_ITEM_REDSTONE_REPEATER: return new cItemRedstoneRepeaterHandler(a_ItemType);
case E_ITEM_SHEARS: return new cItemShearsHandler(a_ItemType);
@@ -307,7 +309,7 @@ char cItemHandler::GetMaxStackSize(void)
case E_ITEM_BOWL: return 64;
case E_ITEM_BREAD: return 64;
case E_ITEM_BREWING_STAND: return 64;
- case E_ITEM_BUCKET: return 1; // TODO: change this to 16 when turning compatibility to 1.3
+ case E_ITEM_BUCKET: return 16;
case E_ITEM_CARROT: return 64;
case E_ITEM_CAULDRON: return 64;
case E_ITEM_CLAY: return 64;
@@ -352,7 +354,7 @@ char cItemHandler::GetMaxStackSize(void)
case E_ITEM_MELON_SLICE: return 64;
case E_ITEM_NETHER_BRICK: return 64;
case E_ITEM_NETHER_WART: return 64;
- case E_ITEM_PAINTINGS: return 64;
+ case E_ITEM_PAINTING: return 64;
case E_ITEM_PAPER: return 64;
case E_ITEM_POISONOUS_POTATO: return 64;
case E_ITEM_POTATO: return 64;