summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.cpp
diff options
context:
space:
mode:
authordaniel0916 <theschokolps@gmail.com>2014-04-19 20:56:29 +0200
committerdaniel0916 <theschokolps@gmail.com>2014-04-19 20:56:29 +0200
commitcb90029f720d867ba6398569c1b1dac2ee76e205 (patch)
treed16ea187d087b1e91c5136d349b66aafad02d7d6 /src/Entities/Entity.cpp
parentFixed Code (2) (diff)
parentAPIDump: Added a ChunkStay article. (diff)
downloadcuberite-cb90029f720d867ba6398569c1b1dac2ee76e205.tar
cuberite-cb90029f720d867ba6398569c1b1dac2ee76e205.tar.gz
cuberite-cb90029f720d867ba6398569c1b1dac2ee76e205.tar.bz2
cuberite-cb90029f720d867ba6398569c1b1dac2ee76e205.tar.lz
cuberite-cb90029f720d867ba6398569c1b1dac2ee76e205.tar.xz
cuberite-cb90029f720d867ba6398569c1b1dac2ee76e205.tar.zst
cuberite-cb90029f720d867ba6398569c1b1dac2ee76e205.zip
Diffstat (limited to 'src/Entities/Entity.cpp')
-rw-r--r--src/Entities/Entity.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 86aee4c6f..56ef36ef8 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -771,6 +771,16 @@ void cEntity::TickBurning(cChunk & a_Chunk)
{
// Remember the current burning state:
bool HasBeenBurning = (m_TicksLeftBurning > 0);
+
+ if (GetWorld()->GetWeather() == eWeather_Rain)
+ {
+ if (HasBeenBurning)
+ {
+ m_TicksLeftBurning = 0;
+ OnFinishedBurning();
+ }
+ return;
+ }
// Do the burning damage:
if (m_TicksLeftBurning > 0)