From 599e13e95e81aadb959c9f3715aec9b425ede084 Mon Sep 17 00:00:00 2001
From: Thomas--S <Thomas--S@users.noreply.github.com>
Date: Sun, 4 Jun 2017 21:42:32 +0200
Subject: Remove deprecated code segments (#5891)

---
 src/mapblock.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/mapblock.cpp')

diff --git a/src/mapblock.cpp b/src/mapblock.cpp
index ec10a49bb..07912b9a2 100644
--- a/src/mapblock.cpp
+++ b/src/mapblock.cpp
@@ -27,7 +27,6 @@ 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
@@ -931,12 +930,7 @@ 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
-		if (version >= 21) {
-			nimap.deSerialize(is);
-		// Else set the legacy mapping
-		} else {
-			content_mapnode_get_name_id_mapping(&nimap);
-		}
+		nimap.deSerialize(is);
 		correctBlockNodeIds(&nimap, data, m_gamedef);
 	}
 
-- 
cgit v1.2.3