diff options
author | Mattes D <github@xoft.cz> | 2014-08-22 15:18:39 +0200 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-08-22 15:18:39 +0200 |
commit | e034b64a5b4aab6f285ba732923cea70dca44d2d (patch) | |
tree | 9705effad70cbd41078d7893feda0a0236515581 /src/Items | |
parent | cMojangAPI updates cRankManager's playernames. (diff) | |
parent | Fixed a warning in FastRandom. (diff) | |
download | cuberite-e034b64a5b4aab6f285ba732923cea70dca44d2d.tar cuberite-e034b64a5b4aab6f285ba732923cea70dca44d2d.tar.gz cuberite-e034b64a5b4aab6f285ba732923cea70dca44d2d.tar.bz2 cuberite-e034b64a5b4aab6f285ba732923cea70dca44d2d.tar.lz cuberite-e034b64a5b4aab6f285ba732923cea70dca44d2d.tar.xz cuberite-e034b64a5b4aab6f285ba732923cea70dca44d2d.tar.zst cuberite-e034b64a5b4aab6f285ba732923cea70dca44d2d.zip |
Diffstat (limited to 'src/Items')
-rw-r--r-- | src/Items/ItemGoldenApple.h | 2 | ||||
-rw-r--r-- | src/Items/ItemShovel.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/Items/ItemGoldenApple.h b/src/Items/ItemGoldenApple.h index 4e1096e65..02ac0202c 100644 --- a/src/Items/ItemGoldenApple.h +++ b/src/Items/ItemGoldenApple.h @@ -29,7 +29,7 @@ public: a_Player->AddEntityEffect(cEntityEffect::effRegeneration, 100, 1); // When the apple is a 'notch apple', give extra effects: - if (a_Item->m_ItemDamage > 0) + if (a_Item->m_ItemDamage >= E_META_GOLDEN_APPLE_ENCHANTED) { a_Player->AddEntityEffect(cEntityEffect::effRegeneration, 600, 4); a_Player->AddEntityEffect(cEntityEffect::effResistance, 6000, 0); diff --git a/src/Items/ItemShovel.h b/src/Items/ItemShovel.h index 7d5760fa9..cd235678d 100644 --- a/src/Items/ItemShovel.h +++ b/src/Items/ItemShovel.h @@ -19,7 +19,6 @@ public: cItemShovelHandler(int a_ItemType) : cItemHandler(a_ItemType) { - } virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_Dir) override |