Item update bug fixed, added dev commands.

10sa · May 5, 2017 · 4861e62 · 4861e62
1 parent 75d84f8
commit 4861e62
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/nutscript/gamemode/libs/sh_character.lua b/nutscript/gamemode/libs/sh_character.lua
@@ -664,7 +664,11 @@ if (SERVER) then
 		inventory.buffer = {}
 
 		function inventory:Add(class, quantity, data2)
-			self.buffer = nut.util.StackInv(self.buffer, class, quantity, data2)
+			if (IsValid(nut.item.Get(class))) then
+				self.buffer = nut.util.StackInv(self.buffer, class, quantity, data2);
+			else
+				ErrorNoHalt("Character Default Item missing - Class : "..class.."\n");
+			end
 		end
 
 		AdvNut.hook.Run("GetDefaultInv", inventory, client, charData)
@@ -719,9 +723,9 @@ if (SERVER) then
 	-- Deletes a character from the database if it exists.
 	netstream.Hook("nut_CharDelete", function(client, index)
 		index = tonumber(index)
-
+	
 		if (!index) then return end
-
+		
 		if (client.character and client:GetMoney() < nut.config.startingAmount) then
 			return false
 		end

diff --git a/nutscript/gamemode/sh_commands.lua b/nutscript/gamemode/sh_commands.lua
@@ -727,21 +727,37 @@ nut.command.Register({
 // DON'T USE THIS COMMAND, ONLY FOR DEBUG //
 nut.command.Register({
 	syntax = nut.lang.Get("syntax_none"),
+	adminOnly = true,
 	onRun = function(client, arguments)
-		if(client:SteamID() != "STEAM_0:1:44985327") then return end;
 		AdvNut.hook.Run("SaveData");
 		nut.util.Notify("DEBUG - End Saved Data", client);
 	end
 }, "startsavedata")
 
 nut.command.Register({
 	syntax = nut.lang.Get("syntax_none"),
+	adminOnly = true,
 	onRun = function(client, arguments)
-		if(client:SteamID() != "STEAM_0:1:44985327") then return end;
 		AdvNut.hook.Run( 'LoadData' )
 		nut.util.Notify("DEBUG - End Loaded Data", client);
 	end
 }, "startloaddata")
+
+nut.command.Register({
+	syntax = nut.lang.Get("syntax_none"),
+	adminOnly = true,
+	onRun = function(client, arguments)
+		PrintTable(client:GetInventory());
+	end
+}, "printplayerinv")
+
+nut.command.Register({
+	syntax = nut.lang.Get("syntax_none"),
+	adminOnly = true,
+	onRun = function(client, arguments)
+		PrintTable(nut.char.buffer);
+	end
+}, "printcachedcharlist")
 // END //
 
 nut.command.Register({

diff --git a/nutscript/gamemode/sh_util.lua b/nutscript/gamemode/sh_util.lua
@@ -624,6 +624,10 @@ function nut.util.StackInv(inventory, class, quantity, data)
 	local stack, index
 	quantity = quantity or 1
 
+	if (!IsValid(data)) then
+		data = { };
+	end
+
 	inventory[class] = inventory[class] or {}
 
 	for k, v in pairs(inventory[class]) do