summaryrefslogtreecommitdiffstats
path: root/src/Items
diff options
context:
space:
mode:
authorJaume Aloy <hircine45@gmail.com>2014-08-19 12:38:15 +0200
committerJaume Aloy <hircine45@gmail.com>2014-08-19 12:38:15 +0200
commitd3fd63c9eb5f783da0186efcef81a5b0eb9338d6 (patch)
tree58041caa169e5bd5ac4e5f6887ee24e2aea1d8b5 /src/Items
parentMerge pull request #1329 from mc-server/Move (diff)
downloadcuberite-d3fd63c9eb5f783da0186efcef81a5b0eb9338d6.tar
cuberite-d3fd63c9eb5f783da0186efcef81a5b0eb9338d6.tar.gz
cuberite-d3fd63c9eb5f783da0186efcef81a5b0eb9338d6.tar.bz2
cuberite-d3fd63c9eb5f783da0186efcef81a5b0eb9338d6.tar.lz
cuberite-d3fd63c9eb5f783da0186efcef81a5b0eb9338d6.tar.xz
cuberite-d3fd63c9eb5f783da0186efcef81a5b0eb9338d6.tar.zst
cuberite-d3fd63c9eb5f783da0186efcef81a5b0eb9338d6.zip
Diffstat (limited to '')
-rw-r--r--src/Items/ItemBow.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/Items/ItemBow.h b/src/Items/ItemBow.h
index fdc24689c..0fc0f0920 100644
--- a/src/Items/ItemBow.h
+++ b/src/Items/ItemBow.h
@@ -75,7 +75,6 @@ public:
Arrow = NULL;
return;
}
-
a_Player->GetWorld()->BroadcastSoundEffect("random.bow", a_Player->GetPosX(), a_Player->GetPosY(), a_Player->GetPosZ(), 0.5, (float)Force);
if (!a_Player->IsGameModeCreative())
{
@@ -83,8 +82,19 @@ public:
{
a_Player->GetInventory().RemoveItem(cItem(E_ITEM_ARROW));
}
+ else
+ {
+ Arrow->SetPickupState(cArrowEntity::ePickupState::psNoPickup);
+ }
+
+
a_Player->UseEquippedItem();
}
+
+ if (a_Player->GetEquippedItem().m_Enchantments.GetLevel(cEnchantments::enchFlame) > 0)
+ {
+ Arrow->StartBurning(100);
+ }
}
} ;