summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-06-04 14:22:50 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-06-04 14:22:50 +0200
commit01f38d883602045e84fdf98bf3395e97608d9aad (patch)
treea20b433772cc2d388a0972f6a78850a719c8378c /src
parentMerge remote-tracking branch 'origin/master' into portals (diff)
downloadcuberite-01f38d883602045e84fdf98bf3395e97608d9aad.tar
cuberite-01f38d883602045e84fdf98bf3395e97608d9aad.tar.gz
cuberite-01f38d883602045e84fdf98bf3395e97608d9aad.tar.bz2
cuberite-01f38d883602045e84fdf98bf3395e97608d9aad.tar.lz
cuberite-01f38d883602045e84fdf98bf3395e97608d9aad.tar.xz
cuberite-01f38d883602045e84fdf98bf3395e97608d9aad.tar.zst
cuberite-01f38d883602045e84fdf98bf3395e97608d9aad.zip
Diffstat (limited to 'src')
-rw-r--r--src/Blocks/BlockCauldron.h2
-rw-r--r--src/Entities/Entity.cpp2
-rw-r--r--src/Mobs/Monster.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Blocks/BlockCauldron.h b/src/Blocks/BlockCauldron.h
index 8b5cd9ccb..5ec776df6 100644
--- a/src/Blocks/BlockCauldron.h
+++ b/src/Blocks/BlockCauldron.h
@@ -61,7 +61,7 @@ public:
virtual void OnUpdate(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_RelX, int a_RelY, int a_RelZ) override
{
- if (!a_WorldInterface.IsWeatherWet())
+ if (IsBiomeNoDownfall(a_Chunk.GetBiomeAt(a_RelX, a_RelZ)) || !a_WorldInterface.IsWeatherWet())
{
return;
}
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index de6c628e9..16264a608 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -869,7 +869,7 @@ void cEntity::TickBurning(cChunk & a_Chunk)
// Remember the current burning state:
bool HasBeenBurning = (m_TicksLeftBurning > 0);
- if (m_World->IsWeatherWet())
+ if (IsBiomeNoDownfall(a_Chunk.GetBiomeAt(POSX_TOINT - a_Chunk.GetPosX() * cChunkDef::Width, POSZ_TOINT - a_Chunk.GetPosZ() * cChunkDef::Width)) || GetWorld()->IsWeatherWet())
{
if (POSY_TOINT > m_World->GetHeight(POSX_TOINT, POSZ_TOINT))
{
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index fa3969d5e..c25ee6b75 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -1034,7 +1034,7 @@ void cMonster::HandleDaylightBurning(cChunk & a_Chunk)
(a_Chunk.GetBlock(RelX, RelY, RelZ) != E_BLOCK_SOULSAND) && // Not on soulsand
(GetWorld()->GetTimeOfDay() < (12000 + 1000)) && // It is nighttime
!IsOnFire() && // Not already burning
- (GetWorld()->IsWeatherWet()) // Not raining
+ (IsBiomeNoDownfall(a_Chunk.GetBiomeAt(RelX, RelZ)) || GetWorld()->IsWeatherWet()) // Not raining
)
{
// Burn for 100 ticks, then decide again