Fix index in ItemHandlerCopySlot#setStackCopy (#1805)

neoforged · Dec 28, 2024 · 71a734b · 71a734b
1 parent e95053c
commit 71a734b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/main/java/net/neoforged/neoforge/items/ItemHandlerCopySlot.java b/src/main/java/net/neoforged/neoforge/items/ItemHandlerCopySlot.java
@@ -38,7 +38,7 @@ protected ItemStack getStackCopy() {
 
     @Override
     protected void setStackCopy(ItemStack stack) {
-        ((IItemHandlerModifiable) slotItemHandler.getItemHandler()).setStackInSlot(index, stack);
+        ((IItemHandlerModifiable) slotItemHandler.getItemHandler()).setStackInSlot(slotItemHandler.index, stack);
     }
 
     @Override

diff --git a/...d/resources/data/neotests_reloadable_reg_data_maps/data_maps/loot_table/effect_grant.json b/...d/resources/data/neotests_reloadable_reg_data_maps/data_maps/loot_table/effect_grant.json
@@ -3,10 +3,6 @@
     "minecraft:blocks/copper_block": {
       "duration": 100,
       "id": "minecraft:nausea",
-      "neoforge:cures": [
-        "protected_by_totem",
-        "milk"
-      ],
       "show_icon": true
     }
   }

diff --git a/tests/src/main/java/net/neoforged/neoforge/debug/data/DataMapTests.java b/tests/src/main/java/net/neoforged/neoforge/debug/data/DataMapTests.java
@@ -317,8 +317,10 @@ static void reloadableRegDataMaps(final DynamicTest test, final RegistrationHelp
         reg.addProvider(event -> new DataMapProvider(event.getGenerator().getPackOutput(), event.getLookupProvider()) {
             @Override
             protected void gather() {
+                var effect = new MobEffectInstance(MobEffects.CONFUSION, 100);
+                effect.getCures().clear(); // Cures use a hash set (not linked) meaning that their serialization is not deterministic
                 builder(effectGrant)
-                        .add(Blocks.COPPER_BLOCK.getLootTable(), new MobEffectInstance(MobEffects.CONFUSION, 100), false);
+                        .add(Blocks.COPPER_BLOCK.getLootTable(), effect, false);
             }
         });