From: kwolekr <kwolekr@minetest.net>
Date: Sun, 4 Oct 2015 06:53:52 +0000 (-0400)
Subject: Remove redundant code in player interact handler
X-Git-Tag: 0.4.14~658
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7b01b94c6bde1989e48208befff8595c141183e6;p=oweals%2Fminetest.git

Remove redundant code in player interact handler
---

diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index d89e30c8d..3ee2dd931 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -1467,21 +1467,22 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
 				NOTE: This can be used in the future to check if
 				somebody is cheating, by checking the timing.
 			*/
+
 			MapNode n(CONTENT_IGNORE);
 			bool pos_ok;
-			n = m_env->getMap().getNodeNoEx(p_under, &pos_ok);
-			if (pos_ok)
-				n = m_env->getMap().getNodeNoEx(p_under, &pos_ok);
 
+			n = m_env->getMap().getNodeNoEx(p_under, &pos_ok);
 			if (!pos_ok) {
 				infostream << "Server: Not punching: Node not found."
 						<< " Adding block to emerge queue."
 						<< std::endl;
-				m_emerge->enqueueBlockEmerge(pkt->getPeerId(), getNodeBlockPos(p_above), false);
+				m_emerge->enqueueBlockEmerge(pkt->getPeerId(),
+					getNodeBlockPos(p_above), false);
 			}
 
 			if (n.getContent() != CONTENT_IGNORE)
 				m_script->node_on_punch(p_under, n, playersao, pointed);
+
 			// Cheat prevention
 			playersao->noCheatDigStart(p_under);
 		}
@@ -1538,9 +1539,10 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
 			MapNode n = m_env->getMap().getNodeNoEx(p_under, &pos_ok);
 			if (!pos_ok) {
 				infostream << "Server: Not finishing digging: Node not found."
-						   << " Adding block to emerge queue."
-						   << std::endl;
-				m_emerge->enqueueBlockEmerge(pkt->getPeerId(), getNodeBlockPos(p_above), false);
+						<< " Adding block to emerge queue."
+						<< std::endl;
+				m_emerge->enqueueBlockEmerge(pkt->getPeerId(),
+					getNodeBlockPos(p_above), false);
 			}
 
 			/* Cheat prevention */