diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-04-18 13:59:14 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-04-18 13:59:14 +0200 |
| commit | 6cb63a768dd2356d0e41aef1ef086ae972449bdd (patch) | |
| tree | 11e962cbe08f7b9345827a076ec339ed3b6f0513 /src/Entities | |
| parent | Fixed #904 (diff) | |
| download | cuberite-6cb63a768dd2356d0e41aef1ef086ae972449bdd.tar cuberite-6cb63a768dd2356d0e41aef1ef086ae972449bdd.tar.gz cuberite-6cb63a768dd2356d0e41aef1ef086ae972449bdd.tar.bz2 cuberite-6cb63a768dd2356d0e41aef1ef086ae972449bdd.tar.lz cuberite-6cb63a768dd2356d0e41aef1ef086ae972449bdd.tar.xz cuberite-6cb63a768dd2356d0e41aef1ef086ae972449bdd.tar.zst cuberite-6cb63a768dd2356d0e41aef1ef086ae972449bdd.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/Entity.cpp | 10 |
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) |