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

9
mods/mesecons/mesecons_mvps/init.lua
View File

@ -94,7 +94,11 @@ function mesecon.mvps_push(pos, dir, maximum) -- pos: pos of mvps; dir: directio
-- add nodes
for _, n in ipairs(nodes) do
<<<<<<< HEAD
local np = mesecon.addPosRule(n.pos, dir)
=======
np = mesecon.addPosRule(n.pos, dir)
>>>>>>> b86fd8cfa9dadcc359b95cdc1135488beae0f467
minetest.add_node(np, n.node)
minetest.get_meta(np):from_table(n.meta)
end
@ -123,8 +127,13 @@ mesecon.register_on_mvps_move(function(moved_nodes)
end)
function mesecon.mvps_pull_single(pos, dir) -- pos: pos of mvps; direction: direction of pull (matches push direction for sticky pistons)
<<<<<<< HEAD
local np = mesecon.addPosRule(pos, dir)
local nn = minetest.get_node(np)
=======
np = mesecon.addPosRule(pos, dir)
nn = minetest.get_node(np)
>>>>>>> b86fd8cfa9dadcc359b95cdc1135488beae0f467
if ((not minetest.registered_nodes[nn.name]) --unregistered node
or minetest.registered_nodes[nn.name].liquidtype == "none") --non-liquid node