Merge branch 'master' into bank

Jumba · May 10, 2010 · 0677ebf · 0677ebf
2 parents 0f439b3 + aa4edd7
commit 0677ebf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/resources/items/items.lua b/resources/items/items.lua
@@ -325,7 +325,7 @@ addCommandHandler( "giveitem",
 			local other, pname = exports.players:getFromName( player, other )
 			if other then
 				-- check if it's a valid item id
-				if id >= 0 and id < #item_list then
+				if id >= 0 and id <= #item_list then
 					-- we need to split our name and value apart
 					local arguments = { ... }
 					local value = { }

diff --git a/resources/shops/shop.lua b/resources/shops/shop.lua
@@ -260,6 +260,14 @@ addEventHandler( "onElementClicked", resourceRoot,
 	end
 )
 
+addEventHandler( "onCharacterLogout", root,
+	function( )
+		if p[ source ] then
+			p[ source ].shopID = nil
+		end
+	end
+)
+
 addEventHandler( "onPlayerQuit", root,
 	function( )
 		p[ source ] = nil