Apply review.

games/devtest/mods/callbacks/players.lua

@@ -5,7 +5,7 @@ local message = function(msg)
 end
 
 core.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities, dir, damage)
-		if not hitter then
-			message("Player "..player:get_player_name().." punched without hitter.")
-		end
-	end)
+	if not hitter then
+		message("Player "..player:get_player_name().." punched without hitter.")
+	end
+end)

src/script/cpp_api/s_entity.cpp

@@ -277,7 +277,7 @@ bool ScriptApiEntity::luaentity_Punch(u16 id,
 	luaL_checktype(L, -1, LUA_TFUNCTION);
 	lua_pushvalue(L, object);  // self
 	if (puncher)
-		objectrefGetOrCreate(L, puncher);  // Clicker reference
+		objectrefGetOrCreate(L, puncher);  // Puncher reference
 	else
 		lua_pushnil(L);
 	lua_pushnumber(L, time_from_last_punch);

src/script/lua_api/l_object.cpp

@@ -170,15 +170,9 @@ int ObjectRef::l_punch(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
 	ObjectRef *ref = checkObject<ObjectRef>(L, 1);
-	ObjectRef *puncher_ref = nullptr;
-	try {
-		puncher_ref = checkObject<ObjectRef>(L, 2);
-	}
-	catch (...) {
-		puncher_ref = nullptr;
-	}
+	ObjectRef *puncher_ref = lua_isnoneornil(L, 2) ? nullptr : checkObject<ObjectRef>(L, 2);
 	ServerActiveObject *sao = getobject(ref);
-	ServerActiveObject *puncher = (puncher_ref)?(getobject(puncher_ref)):(nullptr);
+	ServerActiveObject *puncher = puncher_ref ? getobject(puncher_ref) : nullptr;
 	if (sao == nullptr)
 		return 0;
 

src/server/luaentity_sao.cpp

@@ -335,7 +335,7 @@ u32 LuaEntitySAO::punch(v3f dir,
 	PunchDamageResult result = getPunchDamage(
 			m_armor_groups,
 			toolcap,
-			(puncher)?(&tool_item):(nullptr),
+			puncher ? &tool_item : nullptr,
 			time_from_last_punch,
 			initial_wear);
 
@@ -349,17 +349,16 @@ u32 LuaEntitySAO::punch(v3f dir,
 		}
 	}
 
-	if (puncher)
+	if (puncher) {
 		actionstream << puncher->getDescription() << " (id=" << puncher->getId() <<
-			", hp=" << puncher->getHP() << ") punched " <<
-			getDescription() << " (id=" << m_id << ", hp=" << m_hp <<
-			"), damage=" << (old_hp - (s32)getHP()) <<
-			(damage_handled ? " (handled by Lua)" : "") << std::endl;
-	else
-		actionstream << getDescription() << " (id=" << m_id << ", hp=" << m_hp <<
-			"), damage=" << (old_hp - (s32)getHP()) <<
-			(damage_handled ? " (handled by Lua)" : "") << " punched without puncher" << std::endl;
-
+				", hp=" << puncher->getHP() << ")";
+	} else {
+		actionstream << "(none)";
+	}
+	actionstream << " punched " <<
+		  getDescription() << " (id=" << m_id << ", hp=" << m_hp <<
+		  "), damage=" << (old_hp - (s32)getHP()) <<
+		  (damage_handled ? " (handled by Lua)" : "") << std::endl;
 	// TODO: give Lua control over wear
 	return result.wear;
 }

src/tool.cpp

@@ -467,7 +467,7 @@ PunchDamageResult getPunchDamage(
 	{
 		if (do_hit && punchitem) {
 			if (itemgroup_get(armor_groups, "punch_operable") &&
-					(toolcap == NULL || (punchitem && punchitem->name.empty())))
+					(toolcap == NULL || punchitem->name.empty()))
 				do_hit = false;
 		}