diff options
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 { |