1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-12-26 18:50:38 +01:00

Merge branch 'NALC2' into NALC

This commit is contained in:
sys4-fr 2017-03-31 10:01:14 +02:00
commit ab68b5977c
2 changed files with 2 additions and 2 deletions

View File

@ -26,7 +26,7 @@ ARMOR_LEVEL_MULTIPLIER = 1
-- You can use this to increase or decrease overall armor healing, -- You can use this to increase or decrease overall armor healing,
-- eg: ARMOR_HEAL_MULTIPLIER = 0 will disable healing altogether. -- eg: ARMOR_HEAL_MULTIPLIER = 0 will disable healing altogether.
ARMOR_HEAL_MULTIPLIER = 0 ARMOR_HEAL_MULTIPLIER = 1
-- You can also use this file to execute arbitary lua code -- You can also use this file to execute arbitary lua code
-- eg: Dumb the armor down if using Simple Mobs -- eg: Dumb the armor down if using Simple Mobs

View File

@ -426,7 +426,7 @@ minetest.register_on_joinplayer(function(player)
local name = stack:get_name() local name = stack:get_name()
local player_inv = player:get_inventory() local player_inv = player:get_inventory()
local size = player_inv:get_size(listname) local size = player_inv:get_size(listname)
if not ( (name:split(":")[1] == "3d_armor" and stack:get_definition().groups["armor_heal"]) or name:split(":")[1] == "shields") then if not ( (name:split(":")[1] == "3d_armor" and stack:get_definition().groups["armor_heal"]) or name:split(":")[1] == "shields" or name:split(":")[1] == "technic_armor") then
return 0 return 0
end end