summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2017-09-15 12:19:01 +0200
committerSmallJoker <mk939@ymail.com>2018-06-03 17:31:59 +0200
commitc2a0333901a696f7dcb67356aeb0206b89be14e6 (patch)
tree11d378e7426f53797e94e6f0d103164ffe1356cf /src/network
parent5b2461c713889b9832f5b99c85abf87e5d494242 (diff)
downloadminetest-c2a0333901a696f7dcb67356aeb0206b89be14e6.tar.gz
minetest-c2a0333901a696f7dcb67356aeb0206b89be14e6.tar.bz2
minetest-c2a0333901a696f7dcb67356aeb0206b89be14e6.zip
ServerEnv: Clean up object lifecycle handling (#6414)
* ServerEnv: Clean up object lifecycle handling
Diffstat (limited to 'src/network')
-rw-r--r--src/network/serverpackethandler.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index 62ffdde17..452abdea5 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -1441,8 +1441,8 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
playersao->noCheatDigStart(p_under);
}
else if (pointed.type == POINTEDTHING_OBJECT) {
- // Skip if object has been removed
- if (pointed_object->m_removed)
+ // Skip if object can't be interacted with anymore
+ if (pointed_object->isGone())
return;
actionstream<<player->getName()<<" punches object "
@@ -1600,8 +1600,8 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
if (pointed.type == POINTEDTHING_OBJECT) {
// Right click object
- // Skip if object has been removed
- if (pointed_object->m_removed)
+ // Skip if object can't be interacted with anymore
+ if (pointed_object->isGone())
return;
actionstream << player->getName() << " right-clicks object "