From: Dániel Juhász <juhdanad@gmail.com>
Date: Sun, 18 Dec 2016 09:20:23 +0000 (+0100)
Subject: Fix unnecessary block loading (#4847)
X-Git-Tag: 0.4.15~21
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6d4e7f223a8d79d820546ad750448ee4ecbb1e55;p=oweals%2Fminetest.git

Fix unnecessary block loading (#4847)

This commit makes the game load blocks only if they are not in the
memory.
---

diff --git a/src/emerge.cpp b/src/emerge.cpp
index bdb5e0729..25b2e924b 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -508,13 +508,15 @@ EmergeAction EmergeThread::getBlockOrStartGen(
 
 	// 1). Attempt to fetch block from memory
 	*block = m_map->getBlockNoCreateNoEx(pos);
-	if (*block && !(*block)->isDummy() && (*block)->isGenerated())
-		return EMERGE_FROM_MEMORY;
-
-	// 2). Attempt to load block from disk
-	*block = m_map->loadBlock(pos);
-	if (*block && (*block)->isGenerated())
-		return EMERGE_FROM_DISK;
+	if (*block && !(*block)->isDummy()) {
+		if ((*block)->isGenerated())
+			return EMERGE_FROM_MEMORY;
+	} else {
+		// 2). Attempt to load block from disk if it was not in the memory
+		*block = m_map->loadBlock(pos);
+		if (*block && (*block)->isGenerated())
+			return EMERGE_FROM_DISK;
+	}
 
 	// 3). Attempt to start generation
 	if (allow_gen && m_map->initBlockMake(pos, bmdata))