From 86d7f84b899a507e979f1845f2057cce6f84e743 Mon Sep 17 00:00:00 2001 From: Jozef Behran Date: Sat, 10 Aug 2019 19:45:44 +0200 Subject: Merge pull request #8776 from osjc/FixGetNode Finish getNode cleanup --- src/network/serverpackethandler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/network/serverpackethandler.cpp') diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index 30ae5fc56..5ad60f48a 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -1122,7 +1122,7 @@ void Server::handleCommand_Interact(NetworkPacket *pkt) MapNode n(CONTENT_IGNORE); bool pos_ok; - n = m_env->getMap().getNodeNoEx(p_under, &pos_ok); + n = m_env->getMap().getNode(p_under, &pos_ok); if (!pos_ok) { infostream << "Server: Not punching: Node not found." << " Adding block to emerge queue." @@ -1185,7 +1185,7 @@ void Server::handleCommand_Interact(NetworkPacket *pkt) // Only digging of nodes if (pointed.type == POINTEDTHING_NODE) { bool pos_ok; - MapNode n = m_env->getMap().getNodeNoEx(p_under, &pos_ok); + MapNode n = m_env->getMap().getNode(p_under, &pos_ok); if (!pos_ok) { infostream << "Server: Not finishing digging: Node not found." << " Adding block to emerge queue." @@ -1269,7 +1269,7 @@ void Server::handleCommand_Interact(NetworkPacket *pkt) v3s16 blockpos = getNodeBlockPos(floatToInt(pointed_pos_under, BS)); RemoteClient *client = getClient(pkt->getPeerId()); // Send unusual result (that is, node not being removed) - if (m_env->getMap().getNodeNoEx(p_under).getContent() != CONTENT_AIR) { + if (m_env->getMap().getNode(p_under).getContent() != CONTENT_AIR) { // Re-send block to revert change on client-side client->SetBlockNotSent(blockpos); } -- cgit v1.2.3