Added validity checks for loaded CFGs (refs #80)

timosmit · Mar 13, 2017 · 2442f49 · 2442f49
1 parent db6a378
commit 2442f49
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/luamods/wolfadmin/admin/rules.lua b/luamods/wolfadmin/admin/rules.lua
@@ -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

diff --git a/luamods/wolfadmin/game/sprees.lua b/luamods/wolfadmin/game/sprees.lua
@@ -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
 

diff --git a/luamods/wolfadmin/players/greetings.lua b/luamods/wolfadmin/players/greetings.lua
@@ -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