summaryrefslogtreecommitdiffstats
path: root/src/Mobs/Monster.cpp
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2018-01-15 23:44:48 +0100
committerAlexander Harkness <me@bearbin.net>2018-01-15 23:44:48 +0100
commit3065a101a529a086c3cc10252093a3a75fe839d1 (patch)
tree610621d6181341fc38cf58d0834433e86ce1ab36 /src/Mobs/Monster.cpp
parentcWindow: Fix slot area priority when double click stacking. (#4086) (diff)
downloadcuberite-3065a101a529a086c3cc10252093a3a75fe839d1.tar
cuberite-3065a101a529a086c3cc10252093a3a75fe839d1.tar.gz
cuberite-3065a101a529a086c3cc10252093a3a75fe839d1.tar.bz2
cuberite-3065a101a529a086c3cc10252093a3a75fe839d1.tar.lz
cuberite-3065a101a529a086c3cc10252093a3a75fe839d1.tar.xz
cuberite-3065a101a529a086c3cc10252093a3a75fe839d1.tar.zst
cuberite-3065a101a529a086c3cc10252093a3a75fe839d1.zip
Diffstat (limited to 'src/Mobs/Monster.cpp')
-rw-r--r--src/Mobs/Monster.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 03b809275..9e9d51a78 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -1359,7 +1359,8 @@ bool cMonster::WouldBurnAt(Vector3d a_Location, cChunk & a_Chunk)
if (
(Chunk->GetBlock(Rel.x, Rel.y, Rel.z) != E_BLOCK_SOULSAND) && // Not on soulsand
(GetWorld()->GetTimeOfDay() < 12000 + 1000) && // Daytime
- GetWorld()->IsWeatherSunnyAt(POSX_TOINT, POSZ_TOINT) // Not raining
+ GetWorld()->IsWeatherSunnyAt(POSX_TOINT, POSZ_TOINT) && // Not raining
+ !IsInWater() // Isn't swimming
)
{
int MobHeight = CeilC(a_Location.y + GetHeight()) - 1; // The block Y coord of the mob's head