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

Fixed mob knockback

Browse Source 
* Fixes #901
This commit is contained in:
Tiger Wang 2014-07-17 14:32:52 +01:00
parent db36f1a9fa
commit 3dd9649665
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Entities/Entity.cpp
View File

@ -334,36 +334,21 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
if ((IsMob() || IsPlayer()) && (a_TDI.Attacker != NULL)) // Knockback for only players and mobs if ((IsMob() || IsPlayer()) && (a_TDI.Attacker != NULL)) // Knockback for only players and mobs
{ {
int KnockbackLevel = 0; int KnockbackLevel = a_TDI.Attacker->GetEquippedWeapon().m_Enchantments.GetLevel(cEnchantments::enchKnockback); // More common enchantment
if (a_TDI.Attacker->GetEquippedWeapon().m_ItemType == E_ITEM_BOW) if (KnockbackLevel < 1)
{ {
// We support punch on swords and vice versa! :)
KnockbackLevel = a_TDI.Attacker->GetEquippedWeapon().m_Enchantments.GetLevel(cEnchantments::enchPunch); KnockbackLevel = a_TDI.Attacker->GetEquippedWeapon().m_Enchantments.GetLevel(cEnchantments::enchPunch);
} }
else
{
KnockbackLevel = a_TDI.Attacker->GetEquippedWeapon().m_Enchantments.GetLevel(cEnchantments::enchKnockback);
}
Vector3d additionalSpeed(0, 0, 0); Vector3d AdditionalSpeed(0, 0, 0);
switch (KnockbackLevel) switch (KnockbackLevel)
{ {
case 1: case 1: AdditionalSpeed.Set(5, 0.3, 5); break;
{ case 2: AdditionalSpeed.Set(8, 0.3, 8); break;
additionalSpeed.Set(5, .3, 5); default: break;
break;
}
case 2:
{
additionalSpeed.Set(8, .3, 8);
break;
}
default:
{
additionalSpeed.Set(2, .3, 2);
break;
}
} }
AddSpeed(a_TDI.Knockback * additionalSpeed); AddSpeed(a_TDI.Knockback + AdditionalSpeed);
} }
m_World->BroadcastEntityStatus(*this, esGenericHurt); m_World->BroadcastEntityStatus(*this, esGenericHurt);