diff options
author | 12xx12 <44411062+12xx12@users.noreply.github.com> | 2020-09-17 20:06:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-17 20:06:41 +0200 |
commit | ba5312c198a7bb31b26fba57a966f16f07de1c90 (patch) | |
tree | 6d85b1ffa1059d83018c2d2b65c5e57b952b2b36 /src/Mobs | |
parent | BlockHandler: no dynamic allocation (#4862) (diff) | |
download | cuberite-ba5312c198a7bb31b26fba57a966f16f07de1c90.tar cuberite-ba5312c198a7bb31b26fba57a966f16f07de1c90.tar.gz cuberite-ba5312c198a7bb31b26fba57a966f16f07de1c90.tar.bz2 cuberite-ba5312c198a7bb31b26fba57a966f16f07de1c90.tar.lz cuberite-ba5312c198a7bb31b26fba57a966f16f07de1c90.tar.xz cuberite-ba5312c198a7bb31b26fba57a966f16f07de1c90.tar.zst cuberite-ba5312c198a7bb31b26fba57a966f16f07de1c90.zip |
Diffstat (limited to 'src/Mobs')
-rw-r--r-- | src/Mobs/Enderman.cpp | 4 | ||||
-rw-r--r-- | src/Mobs/SnowGolem.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Mobs/Enderman.cpp b/src/Mobs/Enderman.cpp index aa7c00bdd..3b8cd77e5 100644 --- a/src/Mobs/Enderman.cpp +++ b/src/Mobs/Enderman.cpp @@ -159,14 +159,14 @@ void cEnderman::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) return; } - // Take damage when wet, drowning damage seems to be most appropriate + // Take damage when wet if ( cChunkDef::IsValidHeight(POSY_TOINT) && (GetWorld()->IsWeatherWetAtXYZ(GetPosition().Floor()) || IsInWater()) ) { EventLosePlayer(); - TakeDamage(dtDrowning, nullptr, 1, 0); + TakeDamage(dtEnvironment, nullptr, 1, 0); // TODO teleport to a safe location } } diff --git a/src/Mobs/SnowGolem.cpp b/src/Mobs/SnowGolem.cpp index 2e6d5ea09..93c29cafb 100644 --- a/src/Mobs/SnowGolem.cpp +++ b/src/Mobs/SnowGolem.cpp @@ -38,7 +38,7 @@ void cSnowGolem::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) } if (IsBiomeNoDownfall(m_World->GetBiomeAt(POSX_TOINT, POSZ_TOINT))) { - TakeDamage(*this); + TakeDamage(dtEnvironment, nullptr, GetRawDamageAgainst(*this), GetKnockbackAmountAgainst(*this)); } else { |