From b5410c718ece106a3b25fab4a5c37815715df275 Mon Sep 17 00:00:00 2001 From: 12xx12 <44411062+12xx12@users.noreply.github.com> Date: Thu, 24 Sep 2020 14:53:49 +0200 Subject: Fix ice behaviour in world (#4927) + Added proper ice melting under light influence Co-authored-by: Tiger Wang --- src/Blocks/BlockIce.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) (limited to 'src/Blocks/BlockIce.h') diff --git a/src/Blocks/BlockIce.h b/src/Blocks/BlockIce.h index e20ce6daa..10cd71b8a 100644 --- a/src/Blocks/BlockIce.h +++ b/src/Blocks/BlockIce.h @@ -25,9 +25,56 @@ private: { return cItem(m_BlockType); } - else + + return {}; + } + + virtual void OnUpdate( + cChunkInterface & a_ChunkInterface, + cWorldInterface & a_WorldInterface, + cBlockPluginInterface & a_PluginInterface, + cChunk & a_Chunk, + const Vector3i a_RelPos + ) const override + { + // Disappears instantly in nether: + if (a_WorldInterface.GetDimension() == dimNether) + { + a_Chunk.SetBlock(a_RelPos, E_BLOCK_AIR, 0); + return; + } + + // Artificial light on any of the surrounding block > 11 leads to melting the ice. + static const std::array Adjacents + { + { + { 1, 0, 0 }, { -1, 0, 0 }, + { 0, 1, 0 }, { 0, -1, 0 }, + { 0, 0, 1 }, { 0, 0, -1 } + } + }; + + for (const auto Offset : Adjacents) { - return {}; + auto Position = a_RelPos + Offset; + const auto Chunk = a_Chunk.GetRelNeighborChunkAdjustCoords(Position); + + if ((Chunk == nullptr) || !Chunk->IsValid()) + { + continue; + } + + if (!Chunk->IsLightValid()) + { + Chunk->GetWorld()->QueueLightChunk(Chunk->GetPosX(), Chunk->GetPosZ()); + continue; + } + + if (Chunk->GetBlockLight(Position) > 11) + { + a_Chunk.SetBlock(a_RelPos, E_BLOCK_STATIONARY_WATER, 0); + return; + } } } -- cgit v1.2.3