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

Merge pull request #1287 from Howaner/Bow

Browse Source 
Added arrow consuming on shooting
This commit is contained in:
Franz Reiter 2014-08-04 22:30:58 +02:00
commit e2c4fbd4e2
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);
// Does the player have an arrow?
if (!a_Player->IsGameModeCreative() && !a_Player->GetInventory().HasItems(cItem(E_ITEM_ARROW)))
{
return;
}
// Create the arrow entity:
cArrowEntity * Arrow = new cArrowEntity(*a_Player, Force * 2);
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);
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();
}
}