summaryrefslogtreecommitdiff
path: root/builtin/chatcommands.lua
diff options
context:
space:
mode:
Diffstat (limited to 'builtin/chatcommands.lua')
-rw-r--r--builtin/chatcommands.lua9
1 files changed, 6 insertions, 3 deletions
diff --git a/builtin/chatcommands.lua b/builtin/chatcommands.lua
index 03c278d4d..f8df83d8e 100644
--- a/builtin/chatcommands.lua
+++ b/builtin/chatcommands.lua
@@ -261,9 +261,12 @@ minetest.register_chatcommand("teleport", {
}
for _, d in ipairs(tries) do
local p = {x = pos.x+d.x, y = pos.y+d.y, z = pos.z+d.z}
- local n = minetest.get_node(p)
- if not minetest.registered_nodes[n.name].walkable then
- return p, true
+ local n = minetest.get_node_or_nil(p)
+ if n and n.name then
+ local def = minetest.registered_nodes[n.name]
+ if def and not def.walkable then
+ return p, true
+ end
end
end
return pos, false