From 212c30c866127c9b02870b5d83db1111ece3054d Mon Sep 17 00:00:00 2001 From: Sergwest Date: Fri, 8 Mar 2024 23:40:53 +0300 Subject: [PATCH] block on_item_use when activating on_item_use_on_block --- src/logic/PlayerController.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp index 1ebe8d0a..78e36273 100644 --- a/src/logic/PlayerController.cpp +++ b/src/logic/PlayerController.cpp @@ -298,17 +298,12 @@ void PlayerController::updateInteraction(){ blocksController->breakBlock(player.get(), target, x, y, z); } if (rclick && !input.shift) { - bool preventDefault = false; - - if (item->rt.funcsset.on_use) { - preventDefault |= scripting::on_item_use(player.get(), item); - } if (item->rt.funcsset.on_use_on_block) { - preventDefault |= scripting::on_item_use_on_block(player.get(), item, x, y, z); - } - if (preventDefault) { - return; - } + scripting::on_item_use_on_block(player.get(), item, x, y, z); + } else + if (item->rt.funcsset.on_use) { + scripting::on_item_use(player.get(), item); + } else return; } if (def && rclick){ if (!input.shift && target->rt.funcsset.oninteract) {