diff options
| author | Lane Kolbly <lane@rscheme.org> | 2017-08-22 16:05:13 +0200 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2017-08-22 16:05:13 +0200 |
| commit | af6963f40f7eeb53974773b733fff6238b3d2a47 (patch) | |
| tree | fec25e159071995d57f591b7430f77f773977bf1 | |
| parent | Potential spawn prepare fix (#3924) (diff) | |
| download | cuberite-af6963f40f7eeb53974773b733fff6238b3d2a47.tar cuberite-af6963f40f7eeb53974773b733fff6238b3d2a47.tar.gz cuberite-af6963f40f7eeb53974773b733fff6238b3d2a47.tar.bz2 cuberite-af6963f40f7eeb53974773b733fff6238b3d2a47.tar.lz cuberite-af6963f40f7eeb53974773b733fff6238b3d2a47.tar.xz cuberite-af6963f40f7eeb53974773b733fff6238b3d2a47.tar.zst cuberite-af6963f40f7eeb53974773b733fff6238b3d2a47.zip | |
| -rw-r--r-- | src/Entities/Entity.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 9b5160cda..7e374d9ba 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -1173,6 +1173,12 @@ void cEntity::ApplyFriction(Vector3d & a_Speed, double a_SlowdownMultiplier, flo void cEntity::TickBurning(cChunk & a_Chunk) { + // If we're about to change worlds, then we can't accurately determine whether we're in lava (#3939) + if (m_IsWorldChangeScheduled) + { + return; + } + // Remember the current burning state: bool HasBeenBurning = (m_TicksLeftBurning > 0); |