Fix offhand lit variants not extinguishing properly

realguyman · Jun 3, 2022 · e98564f · e98564f
1 parent 86f1d15
commit e98564f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/io/github/realguyman/totally_lit/mixin/ItemMixin.java b/src/main/java/io/github/realguyman/totally_lit/mixin/ItemMixin.java
@@ -43,7 +43,13 @@ private void inventoryTick(ItemStack stack, World world, Entity entity, int slot
             }
 
             if (chance != null && ((player.isSubmergedInWater() || player.isSwimming()) || (player.isTouchingWater() && world.getRandom().nextInt(100) == 0) || (player.age % 940 == 0 && world.hasRain(player.getCameraBlockPos()) && world.getRandom().nextFloat() < chance))) {
-                player.getInventory().setStack(slot, new ItemStack(item, stack.getCount()));
+                ItemStack offhandStack = player.getOffHandStack();
+
+                if (offhandStack.isOf(Items.JACK_O_LANTERN) || offhandStack.isOf(Items.LANTERN) || offhandStack.isOf(Items.TORCH) || offhandStack.getItem() instanceof LitTorchItem) {
+                    player.getInventory().offHand.set(0, new ItemStack(item, offhandStack.getCount()));
+                } else {
+                    player.getInventory().setStack(slot, new ItemStack(item, stack.getCount()));
+                }
             }
         }
     }