From 8bdde45895658f16aa6b2546ccb59c5c4c9fc699 Mon Sep 17 00:00:00 2001
From: Loïc Blot <loic.blot@unix-experience.fr>
Date: Tue, 6 Jun 2017 16:19:04 +0200
Subject: Revert "Remove deprecated code segments (#5891)"

This reverts commit 599e13e95e81aadb959c9f3715aec9b425ede084.
---
 src/mapblock.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/mapblock.cpp')

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index 07912b9a2..ec10a49bb 100644
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "gamedef.h"
 #include "log.h"
 #include "nameidmapping.h"
+#include "content_mapnode.h" // For legacy name-id mapping
 #include "content_nodemeta.h" // For legacy deserialization
 #include "serialization.h"
 #ifndef SERVER
@@ -930,7 +931,12 @@ void MapBlock::deSerialize_pre22(std::istream &is, u8 version, bool disk)
 		// Dynamically re-set ids based on node names
 		NameIdMapping nimap;
 		// If supported, read node definition id mapping
-		nimap.deSerialize(is);
+		if (version >= 21) {
+			nimap.deSerialize(is);
+		// Else set the legacy mapping
+		} else {
+			content_mapnode_get_name_id_mapping(&nimap);
+		}
 		correctBlockNodeIds(&nimap, data, m_gamedef);
 	}
 
-- 
cgit v1.2.3