Fix charger voiding items on right-click (#7942)

Fixes #7934
AppliedEnergistics · Jun 18, 2024 · 51ef1d2 · 51ef1d2
1 parent 39cb312
commit 51ef1d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/appeng/block/misc/ChargerBlock.java b/src/main/java/appeng/block/misc/ChargerBlock.java
@@ -76,7 +76,7 @@ protected ItemInteractionResult useItemOn(ItemStack heldItem, BlockState state,
             Player player, InteractionHand hand, BlockHitResult hit) {
         if (level.getBlockEntity(pos) instanceof ChargerBlockEntity charger) {
             var inv = charger.getInternalInventory();
-            var chargingItem = inv.extractItem(0, Integer.MAX_VALUE, false);
+            var chargingItem = inv.getStackInSlot(0);
             if (chargingItem.isEmpty()) {
                 if (ChargerRecipes.findRecipe(level, heldItem) != null || Platform.isChargeable(heldItem)) {
                     var toInsert = heldItem.split(1);
@@ -94,8 +94,9 @@ protected InteractionResult useWithoutItem(BlockState state, Level level, BlockP
             BlockHitResult hitResult) {
         if (level.getBlockEntity(pos) instanceof ChargerBlockEntity charger) {
             var inv = charger.getInternalInventory();
-            var chargingItem = inv.extractItem(0, Integer.MAX_VALUE, false);
+            var chargingItem = inv.getStackInSlot(0);
             if (!chargingItem.isEmpty()) {
+                inv.setItemDirect(0, ItemStack.EMPTY);
                 Platform.spawnDrops(player.level(), charger.getBlockPos().relative(charger.getFront()),
                         List.of(chargingItem));
                 return InteractionResult.sidedSuccess(level.isClientSide);

diff --git a/src/main/java/appeng/debug/ItemGenBlock.java b/src/main/java/appeng/debug/ItemGenBlock.java
@@ -40,7 +40,7 @@ public ItemGenBlock() {
     @Override
     protected ItemInteractionResult useItemOn(ItemStack heldItem, BlockState state, Level level, BlockPos pos,
             Player player, InteractionHand hand, BlockHitResult hit) {
-        if (level.getBlockEntity(pos) instanceof ItemGenBlockEntity itemGen) {
+        if (!heldItem.isEmpty() && level.getBlockEntity(pos) instanceof ItemGenBlockEntity itemGen) {
             itemGen.setItem(heldItem.getItem());
 
             return ItemInteractionResult.sidedSuccess(level.isClientSide);