etlegacy/wolfadmin
0
0
Fork 0
mirror of https://github.com/etlegacy/wolfadmin.git synced 2025-04-16 13:51:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added validity checks for loaded CFGs (refs #80)

Browse source
This commit is contained in:
Timo Smit 2017-03-13 09:22:19 +01:00
parent db6a378032
commit 2442f49408
3 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
luamods/wolfadmin/admin/rules.lua
View file

@ -43,7 +43,9 @@ function rules.load()
if amount == 0 then return 0 end
for _, rule in ipairs(array["rule"]) do
data[rule["shortcut"]] = rule["rule"]
if rule["shortcut"] and rule["rule"] then
data[rule["shortcut"]] = rule["rule"]
end
end
return amount

14
luamods/wolfadmin/game/sprees.lua
View file

@ -116,14 +116,16 @@ function sprees.load()
for name, block in pairs(array) do
for _, spree in ipairs(block) do
for k, v in pairs(spree) do
if k == "amount" then
spree[k] = tonumber(v)
if spree["msg"] then
for k, v in pairs(spree) do
if k == "amount" then
spree[k] = tonumber(v)
end
end
end
table.insert(spreeMessagesByType[sprees.getRecordTypeByName(name)], spree)
table.insert(spreeMessagesByType[sprees.getRecordTypeByName(name)], spree)
spreeMessages[sprees.getRecordTypeByName(name)][spree["amount"]] = spree
spreeMessages[sprees.getRecordTypeByName(name)][spree["amount"]] = spree
end
end
end

20
luamods/wolfadmin/players/greetings.lua
View file

@ -91,17 +91,21 @@ function greetings.load()
if amount == 0 then return 0 end
for _, greeting in ipairs(array["level"]) do
levelGreetings[tonumber(greeting["level"])] = {
["text"] = greeting["greeting"],
["sound"] = greeting["sound"],
}
if greeting["text"] then
levelGreetings[tonumber(greeting["level"])] = {
["text"] = greeting["greeting"],
["sound"] = greeting["sound"],
}
end
end
for _, greeting in ipairs(array["user"]) do
userGreetings[greeting["guid"]] = {
["text"] = greeting["greeting"],
["sound"] = greeting["sound"],
}
if greeting["text"] then
userGreetings[greeting["guid"]] = {
["text"] = greeting["greeting"],
["sound"] = greeting["sound"],
}
end
end
return amount