From: BlockMen <nmuelll@web.de>
Date: Sun, 25 Oct 2015 17:15:31 +0000 (+0100)
Subject: Check if hitter has inventory when punching item
X-Git-Tag: 0.4.14~569
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eb92bfb03038aa2ed42af46ff5ec7d144f0ff9af;p=oweals%2Fminetest.git

Check if hitter has inventory when punching item

Fixes #3280
---

diff --git a/builtin/game/item_entity.lua b/builtin/game/item_entity.lua
index 190473ceb..a8d7a1863 100644
--- a/builtin/game/item_entity.lua
+++ b/builtin/game/item_entity.lua
@@ -200,9 +200,10 @@ core.register_entity(":__builtin:item", {
 	end,
 
 	on_punch = function(self, hitter)
-		if self.itemstring ~= '' then
-			local left = hitter:get_inventory():add_item("main", self.itemstring)
-			if not left:is_empty() then
+		local inv = hitter:get_inventory()
+		if inv and self.itemstring ~= '' then
+			local left = inv:add_item("main", self.itemstring)
+			if left and not left:is_empty() then
 				self.itemstring = left:to_string()
 				return
 			end