Don't assume hitter ~= nil in on_punchplayer callback

minetest-mods · Mar 15, 2024 · f50d6d6 · f50d6d6
1 parent 7fc313f
commit f50d6d6
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/3d_armor/init.lua b/3d_armor/init.lua
@@ -395,12 +395,14 @@ if armor.config.punch_damage == true then
 	minetest.register_on_punchplayer(function(player, hitter,
 			time_from_last_punch, tool_capabilities)
 		local name = player:get_player_name()
-		local hit_ip = hitter:is_player()
-		if name and hit_ip and minetest.is_protected(player:get_pos(), "") then
-			return
-		elseif name then
-			armor:punch(player, hitter, time_from_last_punch, tool_capabilities)
-			last_punch_time[name] = minetest.get_gametime()
+		if hitter ~= nil then
+			local hit_ip = hitter:is_player()
+			if name and hit_ip and minetest.is_protected(player:get_pos(), "") then
+				return
+			elseif name then
+				armor:punch(player, hitter, time_from_last_punch, tool_capabilities)
+				last_punch_time[name] = minetest.get_gametime()
+			end
 		end
 	end)
 end