diff options
| author | Jozef Behran <jozuejozef@gmail.com> | 2019-08-10 19:45:44 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2019-08-10 19:45:44 +0200 |
| commit | 86d7f84b899a507e979f1845f2057cce6f84e743 (patch) | |
| tree | ec2d965d61bd639fe879f971b98e30bccab63b52 /src/network | |
| parent | 291e7730cf24ba5081f10b5ddbf2494951333827 (diff) | |
| download | minetest-86d7f84b899a507e979f1845f2057cce6f84e743.tar.gz minetest-86d7f84b899a507e979f1845f2057cce6f84e743.tar.bz2 minetest-86d7f84b899a507e979f1845f2057cce6f84e743.zip | |
Merge pull request #8776 from osjc/FixGetNode
Finish getNode cleanup
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/serverpackethandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); } |