summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/lua_api.txt4
-rw-r--r--src/network/serverpackethandler.cpp13
2 files changed, 9 insertions, 8 deletions
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 38fc3066a..985af2f6e 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -6189,9 +6189,9 @@ object you are working with still exists.
* `bone`: string
* `position`: `{x=num, y=num, z=num}` (relative)
* `rotation`: `{x=num, y=num, z=num}` = Rotation on each axis, in degrees
- * `forced_visible`: Boolean to control whether the attached entity
+ * `forced_visible`: Boolean to control whether the attached entity
should appear in first person.
-* `get_attach()`: returns parent, bone, position, rotation, forced_visible,
+* `get_attach()`: returns parent, bone, position, rotation, forced_visible,
or nil if it isn't attached.
* `get_children()`: returns a list of ObjectRefs that are attached to the
object.
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index 0bd09e637..95e7c548e 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -1050,12 +1050,13 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
}
float d = playersao->getEyePosition().getDistanceFrom(target_pos);
- if (!checkInteractDistance(player, d, pointed.dump())
- && pointed.type == POINTEDTHING_NODE) {
- // Re-send block to revert change on client-side
- RemoteClient *client = getClient(peer_id);
- v3s16 blockpos = getNodeBlockPos(pointed.node_undersurface);
- client->SetBlockNotSent(blockpos);
+ if (!checkInteractDistance(player, d, pointed.dump())) {
+ if (pointed.type == POINTEDTHING_NODE) {
+ // Re-send block to revert change on client-side
+ RemoteClient *client = getClient(peer_id);
+ v3s16 blockpos = getNodeBlockPos(pointed.node_undersurface);
+ client->SetBlockNotSent(blockpos);
+ }
return;
}
}