From 431d8a9b83be858193328fe59e75026fa023393f Mon Sep 17 00:00:00 2001 From: HybridDog Date: Thu, 7 Mar 2019 08:31:25 +0100 Subject: Abort when trying to set a not registered node (#7011) I removed the MapNode constructor which takes a nodename and gives the node's id or CONTENT_IGNORE The code which used this constructor (two places) now handles the situation of not registered nodes correctly: * minetest.set_node and similar functions make minetest crash when a not registered node is passed * reverting a node with rollback aborts if the node is not registered --- src/mapnode.cpp | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/mapnode.cpp') diff --git a/src/mapnode.cpp b/src/mapnode.cpp index 3b19160e1..9761a6611 100644 --- a/src/mapnode.cpp +++ b/src/mapnode.cpp @@ -44,18 +44,6 @@ static const u8 rot_to_wallmounted[] = { MapNode */ -// Create directly from a nodename -// If name is unknown, sets CONTENT_IGNORE -MapNode::MapNode(const NodeDefManager *ndef, const std::string &name, - u8 a_param1, u8 a_param2) -{ - content_t id = CONTENT_IGNORE; - ndef->getId(name, id); - param0 = id; - param1 = a_param1; - param2 = a_param2; -} - void MapNode::getColor(const ContentFeatures &f, video::SColor *color) const { if (f.palette) { -- cgit v1.2.3