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

11
mods/mesecons/mesecons_pistons/init.lua
View File

@ -55,8 +55,13 @@ piston_get_direction = function(dir, node)
end
local piston_remove_pusher = function(pos, node)
<<<<<<< HEAD
local pistonspec = minetest.registered_nodes[node.name].mesecons_piston
local dir = piston_get_direction(pistonspec.dir, node)
=======
pistonspec = minetest.registered_nodes[node.name].mesecons_piston
dir = piston_get_direction(pistonspec.dir, node)
>>>>>>> b86fd8cfa9dadcc359b95cdc1135488beae0f467
local pusherpos = mesecon.addPosRule(pos, dir)
local pushername = minetest.get_node(pusherpos).name
@ -100,9 +105,15 @@ local piston_off = function(pos, node)
piston_remove_pusher(pos, node)
if pistonspec.sticky then
<<<<<<< HEAD
local dir = piston_get_direction(pistonspec.dir, node)
local pullpos = mesecon.addPosRule(pos, dir)
local stack = mesecon.mvps_pull_single(pullpos, dir)
=======
dir = piston_get_direction(pistonspec.dir, node)
pullpos = mesecon.addPosRule(pos, dir)
stack = mesecon.mvps_pull_single(pullpos, dir)
>>>>>>> b86fd8cfa9dadcc359b95cdc1135488beae0f467
mesecon.mvps_process_stack(pos, dir, stack)
end
end