summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorr.ramazanov <r.ramazanov@servplus.ru>2014-04-21 11:13:25 +0200
committerr.ramazanov <r.ramazanov@servplus.ru>2014-04-21 11:13:25 +0200
commita967313839bab2a5f43befabe689801b949b274e (patch)
treed506bf4ee9b708eded1aa87419ca17db0daf53a6
parentAllow 1.6.4 Forge clients to log in. (diff)
downloadcuberite-a967313839bab2a5f43befabe689801b949b274e.tar
cuberite-a967313839bab2a5f43befabe689801b949b274e.tar.gz
cuberite-a967313839bab2a5f43befabe689801b949b274e.tar.bz2
cuberite-a967313839bab2a5f43befabe689801b949b274e.tar.lz
cuberite-a967313839bab2a5f43befabe689801b949b274e.tar.xz
cuberite-a967313839bab2a5f43befabe689801b949b274e.tar.zst
cuberite-a967313839bab2a5f43befabe689801b949b274e.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.cpp17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 56ef36ef8..c1926dafc 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -774,12 +774,19 @@ void cEntity::TickBurning(cChunk & a_Chunk)
if (GetWorld()->GetWeather() == eWeather_Rain)
{
- if (HasBeenBurning)
+
+ int PosX = POSX_TOINT - a_Chunk.GetPosX() * cChunkDef::Width,
+ PosY = POSY_TOINT,
+ PosZ = POSZ_TOINT - a_Chunk.GetPosZ() * cChunkDef::Width;
+
+ if ((PosY > 0) || (PosY <= cChunkDef::Height))
{
- m_TicksLeftBurning = 0;
- OnFinishedBurning();
- }
- return;
+ // Inside the world
+ if (a_Chunk.GetSkyLight(PosX, PosY, PosZ) == 15)
+ {
+ m_TicksLeftBurning = 0;
+ }
+ }
}
// Do the burning damage: