diff --git a/src/game.cpp b/src/game.cpp
index 23f261cfd..6e1765c75 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -3830,6 +3830,12 @@ void Game::handlePointingAtObject(GameRunData *runData,
 
 		if (input->getLeftClicked())
 			do_punch = true;
+		
+		const ToolCapabilities *toolcap = &playeritem.getToolCapabilities(gamedef->idef());
+		if (runData->time_from_last_punch < toolcap->full_punch_interval) {
+			do_punch = false;
+			do_punch_damage = false;
+		}
 
 		if (do_punch) {
 			infostream << "Left-clicked object" << std::endl;