diff options
Diffstat (limited to '')
| -rw-r--r-- | src/Items/ItemPotion.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Items/ItemPotion.h b/src/Items/ItemPotion.h index a176c591e..01c011fa3 100644 --- a/src/Items/ItemPotion.h +++ b/src/Items/ItemPotion.h @@ -8,14 +8,14 @@ class cItemPotionHandler: public cItemHandler { typedef cItemHandler super; - + public: cItemPotionHandler(): super(E_ITEM_POTION) { } - + // cItemHandler overrides: virtual bool IsDrinkable(short a_ItemDamage) override @@ -25,47 +25,47 @@ public: return cEntityEffect::IsPotionDrinkable(a_ItemDamage); } - + virtual bool OnItemUse( cWorld * a_World, cPlayer * a_Player, cBlockPluginInterface & a_PluginInterface, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace ) override { short PotionDamage = a_Item.m_ItemDamage; - + // Do not throw non-splash potions: if (cEntityEffect::IsPotionDrinkable(PotionDamage)) { return false; } - + Vector3d Pos = a_Player->GetThrowStartPos(); Vector3d Speed = a_Player->GetLookVector() * 7; - + if (a_World->CreateProjectile(Pos.x, Pos.y, Pos.z, cProjectileEntity::pkSplashPotion, a_Player, &a_Player->GetEquippedItem(), &Speed) == cEntity::INVALID_ID) { return false; } - + if (!a_Player->IsGameModeCreative()) { a_Player->GetInventory().RemoveOneEquippedItem(); } - + return true; } - - + + virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) override { short PotionDamage = a_Item->m_ItemDamage; - + // Do not drink undrinkable potions: if (!cEntityEffect::IsPotionDrinkable(a_Item->m_ItemDamage)) { return false; } - + a_Player->AddEntityEffect( cEntityEffect::GetPotionEffectType(PotionDamage), cEntityEffect::GetPotionEffectDuration(PotionDamage), |