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

Merge branch 'main' into block_materials

Browse Source
This commit is contained in:
MihailRis
2024-03-09 00:35:37 +03:00
parent d47732ee68 08a10c4605
commit ec10c77707
6 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logic/PlayerController.cpp
+3 -5
View File
@@ -299,12 +299,10 @@ void PlayerController::updateInteraction(){
}
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);
preventDefault = scripting::on_item_use_on_block(player.get(), item, x, y, z);
} else if (item->rt.funcsset.on_use) {
preventDefault = scripting::on_item_use(player.get(), item);
}
if (preventDefault) {
return;