nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-06-28 06:11:47 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of http://github.com/Ombridride/minetest-minetestforfun-server

Browse Source 
Conflicts:
	mods/mesecons/mesecons/internal.lua
	mods/mesecons/mesecons/services.lua
	mods/mesecons/mesecons/util.lua
	mods/mesecons/mesecons_gates/init.lua
	mods/mesecons/mesecons_luacontroller/init.lua
	mods/mesecons/mesecons_movestones/init.lua
	mods/mesecons/mesecons_mvps/init.lua
	mods/mesecons/mesecons_pistons/init.lua
This commit is contained in:
LeMagnesium
2014-11-29 18:56:39 +01:00
parent 3cd50ee817 b86fd8cfa9
commit 304080ff1d
230 changed files with 6746 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mods/mesecons/mesecons_movestones/init.lua
View File

@ -67,7 +67,11 @@ minetest.register_node("mesecons_movestones:movestone", {
local direction=mesecon.get_movestone_direction(pos)
if not direction then return end
minetest.remove_node(pos)
<<<<<<< HEAD
mesecon.on_dignode(pos, node)
=======
mesecon.update_autoconnect(pos)
>>>>>>> b86fd8cfa9dadcc359b95cdc1135488beae0f467
minetest.add_entity(pos, "mesecons_movestones:movestone_entity")
end
}}
@ -151,7 +155,11 @@ minetest.register_node("mesecons_movestones:sticky_movestone", {
local direction=mesecon.get_movestone_direction(pos)
if not direction then return end
minetest.remove_node(pos)
<<<<<<< HEAD
mesecon.on_dignode(pos, node)
=======
mesecon.update_autoconnect(pos)
>>>>>>> b86fd8cfa9dadcc359b95cdc1135488beae0f467
minetest.add_entity(pos, "mesecons_movestones:sticky_movestone_entity")
end
}}
@ -188,8 +196,12 @@ minetest.register_entity("mesecons_movestones:sticky_movestone_entity", {
if name ~= "air" and name ~= "ignore"
and ((not minetest.registered_nodes[name])
or minetest.registered_nodes[name].liquidtype == "none") then
<<<<<<< HEAD
mesecon.mvps_push(pos, self.lastdir,
mesecon.setting("movestone_max_push", 50))
=======
mesecon.mvps_push(pos, self.lastdir, MOVESTONE_MAXIMUM_PUSH)
>>>>>>> b86fd8cfa9dadcc359b95cdc1135488beae0f467
--STICKY
mesecon.mvps_pull_all(pos, self.lastdir)
end
@ -201,7 +213,11 @@ minetest.register_entity("mesecons_movestones:sticky_movestone_entity", {
end
local success, stack, oldstack =
<<<<<<< HEAD
mesecon.mvps_push(pos, direction, mesecon.setting("movestone_max_push", 50))
=======
mesecon.mvps_push(pos, direction, MOVESTONE_MAXIMUM_PUSH)
>>>>>>> b86fd8cfa9dadcc359b95cdc1135488beae0f467
if not success then -- Too large stack/stopper in the way
local nn = {name="mesecons_movestones:sticky_movestone"}
minetest.add_node(pos, nn)