stujones11/minetest-npcf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Autoload and save bugfixes

Browse Source
This commit is contained in:
stujones11 2015-07-25 16:51:19 +01:00
parent 89a9b002de
commit 971444ccdb
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
npcf/chatcommands.lua
View File

@ -214,7 +214,6 @@ minetest.register_chatcommand("npcf", {
if not get_permission(name, npc_id) then
return
end
local npc = get_loaded_npc(npc_id, name)
if npc then
npcf:save(npc_id)
minetest.chat_send_player(name, "NPC "..npc_id.." has been saved")

2
npcf/init.lua
View File

@ -43,7 +43,7 @@ minetest.after(0, function()
if ref then
if ref.name then
npcf.index[id] = ref.owner
if not ref.autoload then
if ref.autoload == nil or ref.autoload == true then
npcf:load(id)
end
end

9
npcf/npcf.lua
View File

@ -158,10 +158,15 @@ function npcf:add_npc(ref)
ref.name = NPCF_ALIAS[ref.name] or ref.name
local def = deepcopy(minetest.registered_entities[ref.name])
if def then
for k, v in pairs(def.metadata) do
if ref.metadata[k] == nil then
ref.metadata[k] = v
end
end
ref.yaw = ref.yaw or {x=0, y=0, z=0}
ref.title = ref.title or def.title
ref.properties = {textures=ref.textures or def.textures}
ref.metadata = ref.metadata or def.metadata
ref.metadata = ref.metadata
ref.var = ref.var or def.var
ref.origin = {
pos = ref.pos,
@ -179,7 +184,7 @@ function npcf:register_npc(name, def)
local ref = deepcopy(def) or {}
local default_npc = deepcopy(self.default_npc)
for k, v in pairs(default_npc) do
if not ref[k] then
if ref[k] == nil then
ref[k] = v
end
end