From e4c090c355dc2af4fd1027881ddbe5c72204ec9a Mon Sep 17 00:00:00 2001
From: gnembon <41132274+gnembon@users.noreply.github.com>
Date: Sat, 11 Feb 2023 01:26:04 +0100
Subject: [PATCH] fxied player_interacts_with_blocks not triggering

---
 .../mixins/ServerPlayerGameMode_scarpetEventsMixin.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/carpet/mixins/ServerPlayerGameMode_scarpetEventsMixin.java b/src/main/java/carpet/mixins/ServerPlayerGameMode_scarpetEventsMixin.java
index 98f0ffec..91eb674f 100644
--- a/src/main/java/carpet/mixins/ServerPlayerGameMode_scarpetEventsMixin.java
+++ b/src/main/java/carpet/mixins/ServerPlayerGameMode_scarpetEventsMixin.java
@@ -53,8 +53,9 @@ public class ServerPlayerGameMode_scarpetEventsMixin implements ServerPlayerInte
     }
 
     @Inject(method = "useItemOn", at = @At(
-            value = "RETURN",
-            ordinal = 2
+            value = "INVOKE",
+            target = "Lnet/minecraft/advancements/critereon/ItemInteractWithBlockTrigger;trigger(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/item/ItemStack;)V",
+            shift = At.Shift.BEFORE
     ))
     private void onBlockActivated(ServerPlayer serverPlayerEntity, Level world, ItemStack stack, InteractionHand hand, BlockHitResult hitResult, CallbackInfoReturnable<InteractionResult> cir)
     {