aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorApickx <apickx@cogarr.com>2017-11-11 22:31:29 -0500
committerApickx <apickx@cogarr.com>2017-11-11 22:31:29 -0500
commitb93f8455c47be19e0af3a855c5fa5ad99b707685 (patch)
tree8ec5d8a5c68c45d6f9faf59f832bfd24226fd991
parentb045e3fe401ed78ab16aa6202eeb36a428f8a8a2 (diff)
downloadwintersurvival2-b93f8455c47be19e0af3a855c5fa5ad99b707685.tar.gz
wintersurvival2-b93f8455c47be19e0af3a855c5fa5ad99b707685.tar.bz2
wintersurvival2-b93f8455c47be19e0af3a855c5fa5ad99b707685.zip
Fixed recipies
-rw-r--r--gamemode/itemsystem/loaditems.lua4
-rw-r--r--gamemode/shared/player_recipes.lua1
2 files changed, 3 insertions, 2 deletions
diff --git a/gamemode/itemsystem/loaditems.lua b/gamemode/itemsystem/loaditems.lua
index fb581e2..374fd18 100644
--- a/gamemode/itemsystem/loaditems.lua
+++ b/gamemode/itemsystem/loaditems.lua
@@ -2,8 +2,8 @@ local Folder = GM.Folder:gsub("gamemodes/","").."/gamemode/itemsystem/items"
local insert = table.insert
print("Hello from loaditems.lua!")
-(GAMEMODE or GM).Items = (GAMEMODE or GM).Items or {}
-(GAMEMODE or GM).Recipes = (GAMEMODE or GM).Items or {}
+GM.Items = GM.Items or {}
+GM.Recipes = GM.Items or {}
--This is so that the client can store info about items/recepies too.
local gmitems = (GAMEMODE or GM).Items
diff --git a/gamemode/shared/player_recipes.lua b/gamemode/shared/player_recipes.lua
index 4a85535..0c326f0 100644
--- a/gamemode/shared/player_recipes.lua
+++ b/gamemode/shared/player_recipes.lua
@@ -39,6 +39,7 @@ else
local Dat = {}
for k,v in pairs(GAMEMODE.Recipes) do
+ if not v.Recipe then continue end
local Ab = v.Recipe.Resources
local Tools = v.Recipe.Tools
local PA = table.Count(Ab)