flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed empty-handed itemhandler.

Browse Source 
This should fix FS 430.
This commit is contained in:
madmaxoft 2013-09-14 08:16:39 +02:00
parent 49f4463484
commit 2973b17977
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/Items/ItemHandler.cpp
View File

@ -54,7 +54,11 @@ cItemHandler * cItemHandler::GetItemHandler(int a_ItemType)
{ {
if (a_ItemType < 0) if (a_ItemType < 0)
{ {
ASSERT(!"Bad item type"); // Either nothing (-1), or bad value, both cases should return the air handler
if (a_ItemType < -1)
{
ASSERT(!"Bad item type");
}
a_ItemType = 0; a_ItemType = 0;
} }
@ -86,6 +90,7 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
case E_BLOCK_SAPLING: return new cItemSaplingHandler(a_ItemType); case E_BLOCK_SAPLING: return new cItemSaplingHandler(a_ItemType);
case E_BLOCK_WOOL: return new cItemClothHandler(a_ItemType); case E_BLOCK_WOOL: return new cItemClothHandler(a_ItemType);
case E_ITEM_BED: return new cItemBedHandler(a_ItemType); case E_ITEM_BED: return new cItemBedHandler(a_ItemType);
case E_ITEM_BOAT: return new cItemBoatHandler(a_ItemType);
case E_ITEM_BOW: return new cItemBowHandler; case E_ITEM_BOW: return new cItemBowHandler;
case E_ITEM_BREWING_STAND: return new cItemBrewingStandHandler(a_ItemType); case E_ITEM_BREWING_STAND: return new cItemBrewingStandHandler(a_ItemType);
case E_ITEM_CAULDRON: return new cItemCauldronHandler(a_ItemType); case E_ITEM_CAULDRON: return new cItemCauldronHandler(a_ItemType);
@ -181,11 +186,6 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
return new cItemMinecartHandler(a_ItemType); return new cItemMinecartHandler(a_ItemType);
} }
case E_ITEM_BOAT:
{
return new cItemBoatHandler(a_ItemType);
}
// Food: // Food:
case E_ITEM_BREAD: case E_ITEM_BREAD:
case E_ITEM_COOKIE: case E_ITEM_COOKIE: