diff options
| author | tycho <work.tycho@gmail.com> | 2015-05-29 01:12:56 +0200 |
|---|---|---|
| committer | tycho <work.tycho@gmail.com> | 2015-05-29 01:12:56 +0200 |
| commit | 4956e8700d9a578fc65481c0fcfddf812366f08b (patch) | |
| tree | 47ae313c74a228d254b08c5a146bbd2ea10e08b7 /src/Entities | |
| parent | Fix comments (diff) | |
| parent | Fixed Info.lua documentation (diff) | |
| download | cuberite-4956e8700d9a578fc65481c0fcfddf812366f08b.tar cuberite-4956e8700d9a578fc65481c0fcfddf812366f08b.tar.gz cuberite-4956e8700d9a578fc65481c0fcfddf812366f08b.tar.bz2 cuberite-4956e8700d9a578fc65481c0fcfddf812366f08b.tar.lz cuberite-4956e8700d9a578fc65481c0fcfddf812366f08b.tar.xz cuberite-4956e8700d9a578fc65481c0fcfddf812366f08b.tar.zst cuberite-4956e8700d9a578fc65481c0fcfddf812366f08b.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/ArrowEntity.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Entities/ArrowEntity.cpp b/src/Entities/ArrowEntity.cpp index 0618ac2fc..492cf2a56 100644 --- a/src/Entities/ArrowEntity.cpp +++ b/src/Entities/ArrowEntity.cpp @@ -84,7 +84,7 @@ void cArrowEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFa int X = BlockHit.x, Y = BlockHit.y, Z = BlockHit.z; m_HitBlockPos = Vector3i(X, Y, Z); - + // Broadcast arrow hit sound m_World->BroadcastSoundEffect("random.bowhit", (double)X, (double)Y, (double)Z, 0.5f, (float)(0.75 + ((float)((GetUniqueID() * 23) % 32)) / 64)); @@ -115,7 +115,7 @@ void cArrowEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) Damage += ExtraDamage; } - int KnockbackAmount = 1; + // int KnockbackAmount = 1; unsigned int PunchLevel = m_CreatorData.m_Enchantments.GetLevel(cEnchantments::enchPunch); if (PunchLevel > 0) { @@ -130,8 +130,9 @@ void cArrowEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) a_EntityHit.SetSpeed(FinalSpeed); } - a_EntityHit.TakeDamage(dtRangedAttack, this, Damage, KnockbackAmount); - + // a_EntityHit.TakeDamage(dtRangedAttack, this, Damage, KnockbackAmount); // TODO fix knockback. + a_EntityHit.TakeDamage(dtRangedAttack, this, Damage, 0); // Until knockback is fixed. + if (IsOnFire() && !a_EntityHit.IsSubmerged() && !a_EntityHit.IsSwimming()) { a_EntityHit.StartBurning(100); |