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

Improvements to knockback (#4504)

Browse Source 
* Improvements to knockback
* SetSpeed for explosions
* Improve code consistency
This commit is contained in:
Mat
2020-03-19 19:13:41 +02:00
committed by GitHub
parent 683d24faad
commit 0e07e231a2
5 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Entities/ArrowEntity.cpp
View File

@@ -115,9 +115,13 @@ void cArrowEntity::OnHitEntity(cEntity & a_EntityHit, Vector3d a_HitPos)
Damage += ExtraDamage;
}
double Knockback = 10;
unsigned int PunchLevel = m_CreatorData.m_Enchantments.GetLevel(cEnchantments::enchPunch);
double KnockbackAmount = 11 + 10 * PunchLevel;
a_EntityHit.TakeDamage(dtRangedAttack, GetCreatorUniqueID(), Damage, KnockbackAmount);
unsigned int PunchLevelMultiplier = 8;
Knockback += PunchLevelMultiplier * PunchLevel;
a_EntityHit.TakeDamage(dtRangedAttack, GetCreatorUniqueID(), Damage, Knockback);
if (IsOnFire() && !a_EntityHit.IsInWater())
{