From 8e71de537636dbeb0be9d018a8518e49a7e8e667 Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Wed, 29 Jul 2020 08:26:36 +0500
Subject: Improved uncompressed chunks decoding

---
 src/Section.cpp | 8 ++++----
 src/World.cpp   | 7 ++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Section.cpp b/src/Section.cpp
index 4a15c58..1d9c203 100644
--- a/src/Section.cpp
+++ b/src/Section.cpp
@@ -61,16 +61,16 @@ BlockId Section::GetBlockId(Vector pos) const {
             return iter->second;
     }
 
-    int value;
+    unsigned int value;
 
-    unsigned char individualValueMask = ((1 << bitsPerBlock) - 1);
+    unsigned int individualValueMask = ((1 << (unsigned int)bitsPerBlock) - 1);
 
     int blockNumber = (((pos.y * 16) + pos.z) * 16) + pos.x;
     int startLong = (blockNumber * bitsPerBlock) / 64;
     int startOffset = (blockNumber * bitsPerBlock) % 64;
     int endLong = ((blockNumber + 1) * bitsPerBlock - 1) / 64;
 
-    unsigned char t;
+    unsigned int t;
 
     if (startLong == endLong) {
         t = (block[startLong] >> startOffset);
@@ -85,7 +85,7 @@ BlockId Section::GetBlockId(Vector pos) const {
 
     if (t >= palette.size()) {
         //LOG(ERROR) << "Out of palette: " << t;
-        value = 0;
+        value = t;
     }
     else
         value = palette[t];
diff --git a/src/World.cpp b/src/World.cpp
index d767871..c3246dc 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -378,7 +378,12 @@ void World::SetBlockId(Vector pos, BlockId block) {
                       std::floor(pos.y / 16.0),
                       std::floor(pos.z / 16.0));
 	Vector blockPos = pos - (sectionPos * 16);
-	auto section = std::make_shared<Section>(*GetSectionPtr(sectionPos));
+    const Section* sectionPtr = GetSectionPtr(sectionPos);
+    if (!sectionPtr) {
+        LOG(ERROR) << "Updating unloaded chunk " << sectionPos;
+        return;
+    }
+    auto section = std::make_shared<Section>(*sectionPtr);
     section->SetBlockId(blockPos, block);
 	sections[sectionPos] = section;
     PUSH_EVENT("ChunkChanged",sectionPos);
-- 
cgit v1.2.3