dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed constructor dupe bug with shulker boxes. Fixes #3343 and #3329

Browse Source
This commit is contained in:
raoulvdberge
2022-08-06 17:00:31 +02:00
parent 885d46c7b9
commit 402f5ef491
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -15,6 +15,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
- Fixed items getting lost on Creative Disk when more than 2,147,483,647 of one type is stored - Fixed items getting lost on Creative Disk when more than 2,147,483,647 of one type is stored
- Fixed incorrect autocrafting keybind prompt on macOS - Fixed incorrect autocrafting keybind prompt on macOS
- Fixed crashing the game when a network block was removed in a bad way - Fixed crashing the game when a network block was removed in a bad way
- Fixed duplication bug with Constructors and Shulker Boxes
### Changed ### Changed

6
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java
View File

@@ -14,8 +14,8 @@ import com.refinedmods.refinedstorage.inventory.item.UpgradeItemHandler;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener; import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
import com.refinedmods.refinedstorage.item.UpgradeItem; import com.refinedmods.refinedstorage.item.UpgradeItem;
import com.refinedmods.refinedstorage.util.StackUtils;
import com.refinedmods.refinedstorage.util.LevelUtils; import com.refinedmods.refinedstorage.util.LevelUtils;
import com.refinedmods.refinedstorage.util.StackUtils;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.PositionImpl; import net.minecraft.core.PositionImpl;
@@ -112,6 +112,8 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable,
private void extractAndPlaceBlock(ItemStack stack) { private void extractAndPlaceBlock(ItemStack stack) {
ItemStack took = network.extractItem(stack, 1, compare, Action.SIMULATE); ItemStack took = network.extractItem(stack, 1, compare, Action.SIMULATE);
if (!took.isEmpty()) { if (!took.isEmpty()) {
// We have to copy took as the forge hook clears the item.
final ItemStack tookCopy = took.copy();
BlockPlaceContext ctx = new ConstructorBlockItemUseContext( BlockPlaceContext ctx = new ConstructorBlockItemUseContext(
level, level,
LevelUtils.getFakePlayer((ServerLevel) level, getOwner()), LevelUtils.getFakePlayer((ServerLevel) level, getOwner()),
@@ -122,7 +124,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable,
InteractionResult result = ForgeHooks.onPlaceItemIntoWorld(ctx); InteractionResult result = ForgeHooks.onPlaceItemIntoWorld(ctx);
if (result.consumesAction()) { if (result.consumesAction()) {
network.extractItem(stack, 1, Action.PERFORM); network.extractItem(tookCopy, 1, Action.PERFORM);
} }
} else if (upgrades.hasUpgrade(UpgradeItem.Type.CRAFTING)) { } else if (upgrades.hasUpgrade(UpgradeItem.Type.CRAFTING)) {
ItemStack craft = itemFilters.getStackInSlot(0); ItemStack craft = itemFilters.getStackInSlot(0);