Fix on_rightclick() being called directly after placing node

BlockMen · BlockMen · commit 127b9aed09d2 · 2015-10-24T12:18:57.000+02:00
fixes luanti-org/minetest_game#537
diff --git a/src/game.cpp b/src/game.cpp
@@ -3673,11 +3673,11 @@ void Game::handlePointingAtNode(GameRunData *runData,
 			} else {
 				soundmaker->m_player_rightpunch_sound =
 						SimpleSoundSpec();
-			}
 
-			if (playeritem_def.node_placement_prediction == "" ||
-					nodedef_manager->get(map.getNodeNoEx(nodepos)).rightclickable)
-				client->interact(3, pointed); // Report to server
+				if (playeritem_def.node_placement_prediction == "" ||
+						nodedef_manager->get(map.getNodeNoEx(nodepos)).rightclickable)
+					client->interact(3, pointed); // Report to server
+			}
 		}
 	}
 }
@@ -4422,4 +4422,3 @@ void the_game(bool *kill,
 		errorstream << "ModError: " << error_message << std::endl;
 	}
 }
-

Original file line number	Diff line number	Diff line change
`@@ -3673,11 +3673,11 @@ void Game::handlePointingAtNode(GameRunData *runData,`
`3673`	`3673`	`} else {`
`3674`	`3674`	`soundmaker->m_player_rightpunch_sound =`
`3675`	`3675`	`SimpleSoundSpec();`
`3676`		`- }`
`3677`	`3676`
`3678`		`- if (playeritem_def.node_placement_prediction == "" \|\|`
`3679`		`- nodedef_manager->get(map.getNodeNoEx(nodepos)).rightclickable)`
`3680`		`- client->interact(3, pointed); // Report to server`
	`3677`	`+ if (playeritem_def.node_placement_prediction == "" \|\|`
	`3678`	`+ nodedef_manager->get(map.getNodeNoEx(nodepos)).rightclickable)`
	`3679`	`+ client->interact(3, pointed); // Report to server`
	`3680`	`+ }`
`3681`	`3681`	`}`
`3682`	`3682`	`}`
`3683`	`3683`	`}`
`@@ -4422,4 +4422,3 @@ void the_game(bool *kill,`
`4422`	`4422`	`errorstream << "ModError: " << error_message << std::endl;`
`4423`	`4423`	`}`
`4424`	`4424`	`}`
`4425`		`-`