Fix cancellation of ChangeBlockEvent.All consuming items

SpongePowered · Nov 3, 2023 · cab6ba2 · cab6ba2
1 parent d035bb1
commit cab6ba2
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...rg/spongepowered/common/mixin/tracker/server/level/ServerPlayerGameModeMixin_Tracker.java b/...rg/spongepowered/common/mixin/tracker/server/level/ServerPlayerGameModeMixin_Tracker.java
@@ -60,7 +60,10 @@
 import org.spongepowered.common.event.inventory.InventoryEventFactory;
 import org.spongepowered.common.event.tracking.PhaseContext;
 import org.spongepowered.common.event.tracking.PhaseTracker;
+import org.spongepowered.common.event.tracking.context.transaction.EffectTransactor;
+import org.spongepowered.common.event.tracking.context.transaction.ResultingTransactionBySideEffect;
 import org.spongepowered.common.event.tracking.context.transaction.TransactionalCaptureSupplier;
+import org.spongepowered.common.event.tracking.context.transaction.effect.InventoryEffect;
 import org.spongepowered.common.event.tracking.context.transaction.inventory.PlayerInventoryTransaction;
 import org.spongepowered.common.registry.provider.DirectionFacingProvider;
 import org.spongepowered.common.util.VecHelper;
@@ -170,8 +173,10 @@ public InteractionResult useItemOn(final ServerPlayer playerIn, final Level worl
                     // Sponge start - log change in hand
                     final PhaseContext<@NonNull ?> context = PhaseTracker.SERVER.getPhaseContext();
                     final TransactionalCaptureSupplier transactor = context.getTransactor();
-                    transactor.logPlayerInventoryChange(this.player, PlayerInventoryTransaction.EventCreator.STANDARD);
-                    this.player.inventoryMenu.broadcastChanges();
+                    try (final EffectTransactor ignored = context.getTransactor().pushEffect(new ResultingTransactionBySideEffect(InventoryEffect.getInstance()))) {
+                        transactor.logPlayerInventoryChange(this.player, PlayerInventoryTransaction.EventCreator.STANDARD);
+                        this.player.inventoryMenu.broadcastChanges();
+                    }
                     // Sponge end
                 }