diff options
author | Jozef Behran <jozuejozef@gmail.com> | 2019-08-10 19:45:44 +0200 |
---|---|---|
committer | sfan5 <sfan5@live.de> | 2019-08-10 19:45:44 +0200 |
commit | 86d7f84b899a507e979f1845f2057cce6f84e743 (patch) | |
tree | ec2d965d61bd639fe879f971b98e30bccab63b52 /src/script/cpp_api | |
parent | 291e7730cf24ba5081f10b5ddbf2494951333827 (diff) | |
download | minetest-86d7f84b899a507e979f1845f2057cce6f84e743.tar.gz minetest-86d7f84b899a507e979f1845f2057cce6f84e743.tar.bz2 minetest-86d7f84b899a507e979f1845f2057cce6f84e743.zip |
Merge pull request #8776 from osjc/FixGetNode
Finish getNode cleanup
Diffstat (limited to 'src/script/cpp_api')
-rw-r--r-- | src/script/cpp_api/s_node.cpp | 2 | ||||
-rw-r--r-- | src/script/cpp_api/s_nodemeta.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/script/cpp_api/s_node.cpp b/src/script/cpp_api/s_node.cpp index 719f53a6b..d93a4c3ad 100644 --- a/src/script/cpp_api/s_node.cpp +++ b/src/script/cpp_api/s_node.cpp @@ -246,7 +246,7 @@ void ScriptApiNode::node_on_receive_fields(v3s16 p, const NodeDefManager *ndef = getServer()->ndef(); // If node doesn't exist, we don't know what callback to call - MapNode node = getEnv()->getMap().getNodeNoEx(p); + MapNode node = getEnv()->getMap().getNode(p); if (node.getContent() == CONTENT_IGNORE) return; diff --git a/src/script/cpp_api/s_nodemeta.cpp b/src/script/cpp_api/s_nodemeta.cpp index b49bb8170..c081e9fc4 100644 --- a/src/script/cpp_api/s_nodemeta.cpp +++ b/src/script/cpp_api/s_nodemeta.cpp @@ -38,7 +38,7 @@ int ScriptApiNodemeta::nodemeta_inventory_AllowMove( const NodeDefManager *ndef = getServer()->ndef(); // If node doesn't exist, we don't know what callback to call - MapNode node = getEnv()->getMap().getNodeNoEx(ma.to_inv.p); + MapNode node = getEnv()->getMap().getNode(ma.to_inv.p); if (node.getContent() == CONTENT_IGNORE) return 0; @@ -76,7 +76,7 @@ int ScriptApiNodemeta::nodemeta_inventory_AllowPut( const NodeDefManager *ndef = getServer()->ndef(); // If node doesn't exist, we don't know what callback to call - MapNode node = getEnv()->getMap().getNodeNoEx(ma.to_inv.p); + MapNode node = getEnv()->getMap().getNode(ma.to_inv.p); if (node.getContent() == CONTENT_IGNORE) return 0; @@ -112,7 +112,7 @@ int ScriptApiNodemeta::nodemeta_inventory_AllowTake( const NodeDefManager *ndef = getServer()->ndef(); // If node doesn't exist, we don't know what callback to call - MapNode node = getEnv()->getMap().getNodeNoEx(ma.from_inv.p); + MapNode node = getEnv()->getMap().getNode(ma.from_inv.p); if (node.getContent() == CONTENT_IGNORE) return 0; @@ -148,7 +148,7 @@ void ScriptApiNodemeta::nodemeta_inventory_OnMove( const NodeDefManager *ndef = getServer()->ndef(); // If node doesn't exist, we don't know what callback to call - MapNode node = getEnv()->getMap().getNodeNoEx(ma.from_inv.p); + MapNode node = getEnv()->getMap().getNode(ma.from_inv.p); if (node.getContent() == CONTENT_IGNORE) return; @@ -181,7 +181,7 @@ void ScriptApiNodemeta::nodemeta_inventory_OnPut( const NodeDefManager *ndef = getServer()->ndef(); // If node doesn't exist, we don't know what callback to call - MapNode node = getEnv()->getMap().getNodeNoEx(ma.to_inv.p); + MapNode node = getEnv()->getMap().getNode(ma.to_inv.p); if (node.getContent() == CONTENT_IGNORE) return; @@ -212,7 +212,7 @@ void ScriptApiNodemeta::nodemeta_inventory_OnTake( const NodeDefManager *ndef = getServer()->ndef(); // If node doesn't exist, we don't know what callback to call - MapNode node = getEnv()->getMap().getNodeNoEx(ma.from_inv.p); + MapNode node = getEnv()->getMap().getNode(ma.from_inv.p); if (node.getContent() == CONTENT_IGNORE) return; |