summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasy98 <masy@antheruscraft.de>2014-09-11 15:57:36 +0200
committerMasy98 <masy@antheruscraft.de>2014-09-11 15:57:36 +0200
commit8c3cd18cdd175ea1ca06916e557fdf42d6232d71 (patch)
treed6a2d0a32bc86566c17f1172247c1ebb5b2a266a
parentAdded blocks to the fire simulator (diff)
downloadcuberite-8c3cd18cdd175ea1ca06916e557fdf42d6232d71.tar
cuberite-8c3cd18cdd175ea1ca06916e557fdf42d6232d71.tar.gz
cuberite-8c3cd18cdd175ea1ca06916e557fdf42d6232d71.tar.bz2
cuberite-8c3cd18cdd175ea1ca06916e557fdf42d6232d71.tar.lz
cuberite-8c3cd18cdd175ea1ca06916e557fdf42d6232d71.tar.xz
cuberite-8c3cd18cdd175ea1ca06916e557fdf42d6232d71.tar.zst
cuberite-8c3cd18cdd175ea1ca06916e557fdf42d6232d71.zip
Diffstat (limited to '')
-rw-r--r--src/BlockID.h2
-rw-r--r--src/Items/ItemFood.h5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/BlockID.h b/src/BlockID.h
index e7838da27..623b40b13 100644
--- a/src/BlockID.h
+++ b/src/BlockID.h
@@ -394,7 +394,7 @@ enum ENUM_ITEM_ID
E_ITEM_NAME_TAG = 421,
E_ITEM_MINECART_WITH_COMMAND_BLOCK = 422,
E_ITEM_RAW_MUTTON = 423,
- E_ITEM_MUTTON = 424,
+ E_ITEM_COOKED_MUTTON = 424,
E_ITEM_BANNER = 425,
E_ITEM_SPRUCE_DOOR = 427,
E_ITEM_BIRCH_DOOR = 428,
diff --git a/src/Items/ItemFood.h b/src/Items/ItemFood.h
index 9035344df..886c5e4a3 100644
--- a/src/Items/ItemFood.h
+++ b/src/Items/ItemFood.h
@@ -34,7 +34,9 @@ public:
// Carrots handled in ItemSeeds
case E_ITEM_COOKED_CHICKEN: return FoodInfo(6, 7.2);
case E_ITEM_COOKED_FISH: return FoodInfo(5, 6); // TODO: Add other fish types
+ case E_ITEM_COOKED_MUTTON: return FoodInfo(6, 9.6);
case E_ITEM_COOKED_PORKCHOP: return FoodInfo(8, 12.8);
+ case E_ITEM_COOKED_RABBIT: return FoodInfo(5, 6);
case E_ITEM_COOKIE: return FoodInfo(2, 0.4);
// Golden apple handled in ItemGoldenApple
case E_ITEM_GOLDEN_CARROT: return FoodInfo(6, 14.4);
@@ -43,16 +45,17 @@ public:
case E_ITEM_POISONOUS_POTATO: return FoodInfo(2, 1.2);
// Potatoes handled in ItemSeeds
case E_ITEM_PUMPKIN_PIE: return FoodInfo(8, 4.8);
+ case E_ITEM_RABBIT_STEW: return FoodInfo(10, 12);
case E_ITEM_RED_APPLE: return FoodInfo(4, 2.4);
case E_ITEM_RAW_BEEF: return FoodInfo(3, 1.8);
case E_ITEM_RAW_CHICKEN: return FoodInfo(2, 1.2);
case E_ITEM_RAW_FISH: return FoodInfo(2, 1.2);
case E_ITEM_RAW_MUTTON: return FoodInfo(2, 1.2);
case E_ITEM_RAW_PORKCHOP: return FoodInfo(3, 1.8);
+ case E_ITEM_RAW_RABBIT: return FoodInfo(3, 1.8);
case E_ITEM_ROTTEN_FLESH: return FoodInfo(4, 0.8);
case E_ITEM_SPIDER_EYE: return FoodInfo(2, 3.2);
case E_ITEM_STEAK: return FoodInfo(8, 12.8);
- case E_ITEM_MUTTON: return FoodInfo(6, 9.6);
}
LOGWARNING("%s: Unknown food item (%d), returning zero nutrition", __FUNCTION__, m_ItemType);
return FoodInfo(0, 0.f);