PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

block on_item_use when activating on_item_use_on_block

Browse Source
This commit is contained in:
Sergwest 2024-03-08 23:40:53 +03:00
parent c6ed28d250
commit 212c30c866
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/logic/PlayerController.cpp
View File

@ -298,17 +298,12 @@ void PlayerController::updateInteraction(){
blocksController->breakBlock(player.get(), target, x, y, z); blocksController->breakBlock(player.get(), target, x, y, z);
} }
if (rclick && !input.shift) { 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) { if (item->rt.funcsset.on_use_on_block) {
preventDefault |= scripting::on_item_use_on_block(player.get(), item, x, y, z); scripting::on_item_use_on_block(player.get(), item, x, y, z);
} } else
if (preventDefault) { if (item->rt.funcsset.on_use) {
return; scripting::on_item_use(player.get(), item);
} } else return;
} }
if (def && rclick){ if (def && rclick){
if (!input.shift && target->rt.funcsset.oninteract) { if (!input.shift && target->rt.funcsset.oninteract) {