Merge branch 'master' of yunohost:mtcontrib/minetest-3d_armor into dev

This commit is contained in:
2019-10-12 14:35:06 +02:00
16 changed files with 204 additions and 28 deletions

View File

@ -1,9 +1,26 @@
[mod] 3d Armor [3d_armor]
=========================
License Source Code: (C) 2012-2017 Stuart Jones - LGPL v2.1
License Source Code
-------------------
License Textures: Copyright (C) 2017 davidthecreator - CC-BY-SA 3.0
Copyright (C) 2012-2019 stujones11, Stuart Jones <stujones111@gmail.com>
https://github.com/daviddoesminetest/3d-armors-new-textures
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
License Textures
----------------
Copyright (C) 2017-2019 davidthecreator - CC-BY-SA 3.0

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