From a57f5ab33f31cf750e2d4f7d68530810348c4e01 Mon Sep 17 00:00:00 2001 From: Flemmli97 Date: Fri, 2 Jul 2021 16:28:12 +0200 Subject: [PATCH] fix #70 claim tools bypassing permissions --- .../github/flemmli97/flan/mixin/AbstractBlockStateMixin.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/io/github/flemmli97/flan/mixin/AbstractBlockStateMixin.java b/common/src/main/java/io/github/flemmli97/flan/mixin/AbstractBlockStateMixin.java index 18a2b4e..c11dc39 100644 --- a/common/src/main/java/io/github/flemmli97/flan/mixin/AbstractBlockStateMixin.java +++ b/common/src/main/java/io/github/flemmli97/flan/mixin/AbstractBlockStateMixin.java @@ -33,8 +33,9 @@ public abstract class AbstractBlockStateMixin { */ @Inject(method = "onUse", at = @At(value = "HEAD"), cancellable = true) private void useBlock(World world, PlayerEntity player, Hand hand, BlockHitResult result, CallbackInfoReturnable info) { - if (BlockInteractEvents.useBlocks(player, world, hand, result) == ActionResult.FAIL) { - info.setReturnValue(ActionResult.FAIL); + ActionResult res = BlockInteractEvents.useBlocks(player, world, hand, result); + if (res != ActionResult.PASS) { + info.setReturnValue(res); info.cancel(); } }