From af6963f40f7eeb53974773b733fff6238b3d2a47 Mon Sep 17 00:00:00 2001 From: Lane Kolbly Date: Tue, 22 Aug 2017 09:05:13 -0500 Subject: [PATCH] Added check in cEntity::TickBurning for whether the entity is planning to change worlds. (#3943) --- src/Entities/Entity.cpp | 6 ++++++ 1 file changed, 6 insertions(+) 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);