Merge branch 'master' into nalc-1.2

This commit is contained in:
2019-05-04 21:26:03 +02:00
9 changed files with 81 additions and 13 deletions

View File

@ -32,11 +32,11 @@ armor_material_mithril = true
armor_material_crystal = true
-- Increase this if you get initialization glitches when a player first joins.
armor_init_delay = 1
armor_init_delay = 2
-- Number of initialization attempts.
-- Use in conjunction with armor_init_delay if initialization problems persist.
armor_init_times = 1
armor_init_times = 10
-- Increase this if armor is not getting into bones due to server lag.
armor_bones_delay = 1
@ -111,7 +111,7 @@ armor:register_armor("mod_name:speed_boots", {
damage_groups = {cracky=3, snappy=3, choppy=3, crumbly=3, level=1},
reciprocate_damage = true,
on_destroy = function(player, index, stack)
local pos = player:getpos()
local pos = player:get_pos()
if pos then
minetest.sound_play({
name = "mod_name_break_sound",

View File

@ -74,7 +74,7 @@ armor = {
on_destroy = {},
},
migrate_old_inventory = true,
version = "0.4.12",
version = "0.4.13",
}
armor.config = {

View File

@ -160,7 +160,7 @@ end
local function init_player_armor(player)
local name = player:get_player_name()
local pos = player:getpos()
local pos = player:get_pos()
if not name or not pos then
return false
end
@ -326,7 +326,7 @@ if armor.config.drop == true or armor.config.destroy == true then
end
armor:save_armor_inventory(player)
armor:set_player_armor(player)
local pos = player:getpos()
local pos = player:get_pos()
if pos and armor.config.destroy == false then
minetest.after(armor.config.bones_delay, function()
local meta = nil
@ -427,7 +427,7 @@ if armor.config.water_protect == true or armor.config.fire_protect == true then
end
for _,player in pairs(minetest.get_connected_players()) do
local name = player:get_player_name()
local pos = player:getpos()
local pos = player:get_pos()
local hp = player:get_hp()
if not name or not pos or not hp then
return