EliasFleckenstein03/Crafter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Push real fix for buttons and switches crashing the game

Browse Source
This commit is contained in:
oilboi 2020-04-02 21:42:10 -04:00
parent 913bfd86bf
commit 556a9c2fd4
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mods/redstone/button.lua
View File

@ -9,8 +9,8 @@ local function on_button_destroy(pos)
local name = node.name
local def = minetest.registered_nodes[name]
if def.drawtype == "normal" and string.match(name, "redstone:") and def.name ~= "redstone:piston_off" then
name = "main:"..string.gsub(name, "redstone:", "")
if def.drawtype == "normal" and string.match(name, "redstone:node_activated_") then
name = "main:"..string.gsub(name, "redstone:node_activated_", "")
minetest.set_node(pos, {name=name})
redstone.collect_info(pos)
end
@ -45,7 +45,7 @@ minetest.register_node("redstone:button_off", {
if def.drawtype == "normal" and string.match(name, "main:") then
minetest.sound_play("lever", {pos=pos})
name = "redstone:"..string.gsub(name, "main:", "")
name = "redstone:node_activated_"..string.gsub(name, "main:", "")
minetest.set_node(pos,{name=name})
redstone.collect_info(pos)
else

12
mods/redstone/switches.lua
View File

@ -10,7 +10,7 @@ for name,def in pairs(minetest.registered_nodes) do
def2.after_destruct = function(pos, oldnode)
redstone.collect_info(pos)
end
local newname = "redstone:"..string.gsub(name, "main:", "")
local newname = "redstone:node_activated_"..string.gsub(name, "main:", "")
def2.name = newname
def2.description = "Redstone "..def.description
minetest.register_node(newname,def2)
@ -29,8 +29,8 @@ local function on_lever_destroy(pos)
local name = node.name
local def = minetest.registered_nodes[name]
if def.drawtype == "normal" and string.match(name, "redstone:") and def.name ~= "redstone:piston_off" then
name = "main:"..string.gsub(name, "redstone:", "")
if def.drawtype == "normal" and string.match(name, "redstone:node_activated_")then
name = "main:"..string.gsub(name, "redstone:node_activated_", "")
minetest.set_node(pos, {name=name})
redstone.collect_info(pos)
end
@ -57,7 +57,6 @@ minetest.register_node("redstone:switch_off", {
},
},
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
minetest.sound_play("lever", {pos=pos})
minetest.set_node(pos, {name="redstone:switch_on",param2=node.param2})
local dir = minetest.wallmounted_to_dir(node.param2)
local pos = vector.add(dir,pos)
@ -65,9 +64,12 @@ minetest.register_node("redstone:switch_off", {
local def = minetest.registered_nodes[name]
if def.drawtype == "normal" and string.match(name, "main:") then
name = "redstone:"..string.gsub(name, "main:", "")
minetest.sound_play("lever", {pos=pos})
name = "redstone:node_activated_"..string.gsub(name, "main:", "")
minetest.set_node(pos,{name=name})
redstone.collect_info(pos)
else
minetest.sound_play("lever", {pos=pos,pitch=0.6})
end
end,
on_destruct = on_lever_destroy,