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

Added arrow consuming on shooting

Browse Source
This commit is contained in:
Howaner 2014-08-04 21:48:33 +02:00
parent f5b71cc1f8
commit 434ea542e1
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Items/ItemBow.h
View File

@ -57,6 +57,12 @@ public:
} }
Force = std::min(Force, 1.0); Force = std::min(Force, 1.0);
// Has the player a arrow?
if (!a_Player->IsGameModeCreative() && !a_Player->GetInventory().HasItems(cItem(E_ITEM_ARROW)))
{
return;
}
// Create the arrow entity: // Create the arrow entity:
cArrowEntity * Arrow = new cArrowEntity(*a_Player, Force * 2); cArrowEntity * Arrow = new cArrowEntity(*a_Player, Force * 2);
if (Arrow == NULL) if (Arrow == NULL)
@ -73,6 +79,10 @@ public:
a_Player->GetWorld()->BroadcastSoundEffect("random.bow", a_Player->GetPosX(), a_Player->GetPosY(), a_Player->GetPosZ(), 0.5, (float)Force); a_Player->GetWorld()->BroadcastSoundEffect("random.bow", a_Player->GetPosX(), a_Player->GetPosY(), a_Player->GetPosZ(), 0.5, (float)Force);
if (!a_Player->IsGameModeCreative()) if (!a_Player->IsGameModeCreative())
{ {
if (a_Player->GetEquippedItem().m_Enchantments.GetLevel(cEnchantments::enchInfinity) == 0)
{
a_Player->GetInventory().RemoveItem(cItem(E_ITEM_ARROW));
}
a_Player->UseEquippedItem(); a_Player->UseEquippedItem();
} }
} }