3 files changed, 15 insertions, 10 deletions

diff --git a/src/client/game.cpp b/src/client/game.cpp
index 953eb1287..6a3902e1a 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -2408,7 +2408,7 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud, bool show_debug)
 	soundmaker->m_player_leftpunch_sound.name = "";
 
 	// Prepare for repeating, unless we're not supposed to
-	if (input->getRightState() && !g_settings->getBool("safe_dig_and_place"))
+	if ((input->getRightState() || g_settings->getBool("autoplace")) && !g_settings->getBool("safe_dig_and_place"))
 		runData.repeat_rightclick_timer += dtime;
 	else
 		runData.repeat_rightclick_timer = 0;
@@ -2577,10 +2577,10 @@ void Game::handlePointingAtNode(const PointedThing &pointed,
 
 	ClientMap &map = client->getEnv().getClientMap();
 
-	if ((runData.nodig_delay_timer <= 0.0 && input->getLeftState()
+	if (((runData.nodig_delay_timer <= 0.0 || g_settings->getBool("fastdig")) && (input->getLeftState() || g_settings->getBool("autodig"))
 			&& !runData.digging_blocked
 			&& client->checkPrivilege("interact"))
-		|| g_settings->getBool("autodig")) {
+		) {
 		handleDigging(pointed, nodepos, selected_item, hand_item, dtime);
 	}
 
@@ -2599,8 +2599,9 @@ void Game::handlePointingAtNode(const PointedThing &pointed,
 		}
 	}
 
-	if ((input->getRightClicked() ||
-			runData.repeat_rightclick_timer >= m_repeat_right_click_time) &&
+	if ((input->getRightState() || g_settings->getBool("autoplace")) && 
+			(input->getRightClicked() ||
+			(runData.repeat_rightclick_timer >= (g_settings->getBool("fastplace") ? 0 : m_repeat_right_click_time))) &&
 			client->checkPrivilege("interact")) {
 		runData.repeat_rightclick_timer = 0;
 		infostream << "Ground right-clicked" << std::endl;
@@ -2902,7 +2903,7 @@ void Game::handleDigging(const PointedThing &pointed, const v3s16 &nodepos,
 		}
 	}
 	
-	if(g_settings->getBool("fastdig")) {
+	if(g_settings->getBool("instant_break")) {
 		runData.dig_time_complete = 0;
 		runData.dig_instantly = true;
 	}
diff --git a/src/client/localplayer.cpp b/src/client/localplayer.cpp
index d84238008..958c07f5c 100644
--- a/src/client/localplayer.cpp
+++ b/src/client/localplayer.cpp
@@ -89,7 +89,7 @@ bool LocalPlayer::updateSneakNode(Map *map, const v3f &position,
 		new_sneak_node_exists = false;
 	} else {
 		node = map->getNode(current_node, &is_valid_position);
-		if (!is_valid_position || !nodemgr->get(node).walkable)
+		if (!is_valid_position || nodemgr->get(node).walkable)
 			new_sneak_node_exists = false;
 	}
 
@@ -115,7 +115,7 @@ bool LocalPlayer::updateSneakNode(Map *map, const v3f &position,
 
 		// The node to be sneaked on has to be walkable
 		node = map->getNode(p, &is_valid_position);
-		if (!is_valid_position || !nodemgr->get(node).walkable)
+		if (!is_valid_position || ! nodemgr->get(node).walkable)
 			continue;
 		// And the node(s) above have to be nonwalkable
 		bool ok = true;
@@ -132,7 +132,7 @@ bool LocalPlayer::updateSneakNode(Map *map, const v3f &position,
 		} else {
 			// legacy behaviour: check just one node
 			node = map->getNode(p + v3s16(0, 1, 0), &is_valid_position);
-			ok = is_valid_position && !nodemgr->get(node).walkable;
+			ok = is_valid_position && ! nodemgr->get(node).walkable;
 		}
 		if (!ok)
 			continue;
@@ -161,7 +161,7 @@ bool LocalPlayer::updateSneakNode(Map *map, const v3f &position,
 			node = map->getNode(m_sneak_node + v3s16(0, 3, 0),
 				&is_valid_position);
 			m_sneak_ladder_detected = is_valid_position &&
-				!nodemgr->get(node).walkable;
+				! nodemgr->get(node).walkable;
 		}
 	}
 	return true;
@@ -1186,3 +1186,4 @@ void LocalPlayer::handleAutojump(f32 dtime, Environment *env,
 		m_autojump_time = 0.1f;
 	}
 }
+
diff --git a/src/client/localplayer.h b/src/client/localplayer.h
index dc3e76118..e2ddb3c87 100644
--- a/src/client/localplayer.h
+++ b/src/client/localplayer.h
@@ -31,6 +31,7 @@ class GenericCAO;
 class ClientActiveObject;
 class ClientEnvironment;
 class IGameDef;
+struct ContentFeatures;
 struct collisionMoveResult;
 
 enum LocalPlayerAnimations
@@ -162,6 +163,8 @@ public:
 	
 	bool isWaitingForReattach() const;
 	
+	bool canWalkOn(const ContentFeatures &f);
+	
 private:
 	void accelerate(const v3f &target_speed, const f32 max_increase_H,
 		const f32 max_increase_V, const bool use_pitch);