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

Merge branch 'master' into portals

Browse Source 
Conflicts:
	src/World.h
This commit is contained in:
Tiger Wang
2014-07-29 15:27:19 +01:00
parent 1156914dd6 5b69b2ce4f
commit 8811837aea
123 changed files with 1753 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Entities/Player.cpp
View File

@@ -1933,14 +1933,14 @@ cPlayer::StringList cPlayer::GetResolvedPermissions()
void cPlayer::UseEquippedItem(void)
void cPlayer::UseEquippedItem(int a_Amount)
{
if (IsGameModeCreative()) // No damage in creative
{
return;
}
if (GetInventory().DamageEquippedItem())
if (GetInventory().DamageEquippedItem(a_Amount))
{
m_World->BroadcastSoundEffect("random.break", GetPosX(), GetPosY(), GetPosZ(), 0.5f, (float)(0.75 + ((float)((GetUniqueID() * 23) % 32)) / 64));
}