nalc
/
server-nalc
mirror of https://github.com/sys4-fr/server-nalc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
sys4-fr 2017-04-10 01:14:00 +02:00
parent 507576e7da 24e1904ffe
commit 29cd5df980
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mods/3d_armor/3d_armor/armor.lua
View File

@ -109,9 +109,12 @@ elseif minetest.get_modpath("unified_inventory") then
.."list[detached:"..name.."_armor;armor;0,"..fy..";2,3;]"
.."image[2.5,"..(fy - 0.25)..";2,4;"..armor.textures[name].preview.."]"
.."label[5.0,"..(fy + 0.0)..";Level: "..armor.def[name].level.."]"
.."label[5.0,"..(fy + 0.5)..";Heal: "..armor.def[name].heal.."]"
.."label[5.0,"..(fy + 1.0)..";Fire: "..armor.def[name].fire.."]"
.."label[5.0,"..(fy + 1.5)..";Radiation: "..armor.def[name].radiation.."]"
.."label[5.0,"..(fy + 0.4)..";Heal: "..armor.def[name].heal.."]"
.."label[5.0,"..(fy + 0.8)..";Fire: "..armor.def[name].fire.."]"
.."label[5.0,"..(fy + 1.2)..";Radiation: "..armor.def[name].radiation.."]"
.."label[5.0,"..(fy + 1.6)..";Speed: "..armor.def[name].speed.."]"
.."label[5.0,"..(fy + 2)..";Jump: "..armor.def[name].jump.."]"
.."label[5.0,"..(fy + 2.4)..";Gravity: "..armor.def[name].gravity.."]"
.."listring[current_player;main]"
.."listring[detached:"..name.."_armor;armor]"
return {formspec=formspec}
@ -302,6 +305,9 @@ armor.get_armor_formspec = function(self, name)
formspec = formspec:gsub("armor_heal", armor.def[name].heal)
formspec = formspec:gsub("armor_fire", armor.def[name].fire)
formspec = formspec:gsub("armor_radiation", armor.def[name].radiation)
formspec = formspec:gsub("armor_speed", armor.def[name].speed)
formspec = formspec:gsub("armor_jump", armor.def[name].jump)
formspec = formspec:gsub("armor_gravity", armor.def[name].gravity)
return formspec
end

11
mods/pipeworks/filter-injector.lua
View File

@ -144,6 +144,17 @@ local function punch_filter(data, filtpos, filtnode, msg)
local dir = minetest.facedir_to_right_dir(filtnode.param2)
local frompos = vector.subtract(filtpos, dir)
local fromnode = minetest.get_node(frompos)
-- Fix crash with connected_chests (sys4 fix for MFF)
if fromnode and fromnode.name == "connected_chests:chest_right" then
local v_mul = vector.multiply(dir, 2)
frompos = vector.subtract(filtpos, v_mul)
fromnode = minetest.get_node(frompos)
if fromnode and fromnode.name ~= "connected_chests:chest_left" then
return
end
end
if not fromnode then return end
local fromdef = minetest.registered_nodes[fromnode.name]
if not fromdef then return end