From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 3 Dec 2011 22:44:29 +0000 (+0200)
Subject: Fix craftitem aliases
X-Git-Tag: 0.4.dev-20111204-1~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=44e36d9aaddb93b0ec0e38561c745a1182536752;p=oweals%2Fminetest.git

Fix craftitem aliases
---

diff --git a/src/craftitemdef.cpp b/src/craftitemdef.cpp
index 622c5c65f..8d4cbea3c 100644
--- a/src/craftitemdef.cpp
+++ b/src/craftitemdef.cpp
@@ -85,8 +85,16 @@ public:
 	{
 		clear();
 	}
-	virtual const CraftItemDefinition* getCraftItemDefinition(const std::string &itemname) const
+	virtual const CraftItemDefinition* getCraftItemDefinition(const std::string &itemname_) const
 	{
+		// Convert name according to possible alias
+		std::string itemname = itemname_;
+		std::map<std::string, std::string>::const_iterator i;
+		i = m_aliases.find(itemname);
+		if(i != m_aliases.end()){
+			itemname = i->second;
+		}
+		// Get the definition
 		core::map<std::string, CraftItemDefinition*>::Node *n;
 		n = m_item_definitions.find(itemname);
 		if(n == NULL)