mirror of
https://github.com/minetest/minetest.git
synced 2024-08-19 04:54:18 +02:00
Fix object interaction distance not being checked (#10547)
This commit is contained in:
parent
c940a57a38
commit
7589cbe086
@ -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.
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user