summaryrefslogtreecommitdiffstats
path: root/src/Entities/ArrowEntity.cpp
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2018-01-14 19:44:45 +0100
committerpeterbell10 <peterbell10@live.co.uk>2018-01-14 19:44:45 +0100
commitad22922393c7982b885840960222de64ff96ad36 (patch)
treea028b7459f3c865f7e8bd563ae476c578763a9b1 /src/Entities/ArrowEntity.cpp
parentTravis: Remove gdb (#4140) (diff)
downloadcuberite-ad22922393c7982b885840960222de64ff96ad36.tar
cuberite-ad22922393c7982b885840960222de64ff96ad36.tar.gz
cuberite-ad22922393c7982b885840960222de64ff96ad36.tar.bz2
cuberite-ad22922393c7982b885840960222de64ff96ad36.tar.lz
cuberite-ad22922393c7982b885840960222de64ff96ad36.tar.xz
cuberite-ad22922393c7982b885840960222de64ff96ad36.tar.zst
cuberite-ad22922393c7982b885840960222de64ff96ad36.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/ArrowEntity.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/Entities/ArrowEntity.cpp b/src/Entities/ArrowEntity.cpp
index 4d104bd26..2dc329f30 100644
--- a/src/Entities/ArrowEntity.cpp
+++ b/src/Entities/ArrowEntity.cpp
@@ -123,7 +123,7 @@ void cArrowEntity::OnHitEntity(cEntity & a_EntityHit, Vector3d a_HitPos)
double KnockbackAmount = 11 + 10 * PunchLevel;
a_EntityHit.TakeDamage(dtRangedAttack, GetCreatorUniqueID(), Damage, KnockbackAmount);
- if (IsOnFire() && !a_EntityHit.IsSubmerged() && !a_EntityHit.IsSwimming())
+ if (IsOnFire() && !a_EntityHit.IsInWater())
{
a_EntityHit.StartBurning(100);
}
@@ -218,7 +218,3 @@ void cArrowEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
}
}
}
-
-
-
-