mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-30 23:05:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Disaster Depot

Browse source 
- Fixed bugs introduced by fa5b71b7eb
This commit is contained in:
simibubi 2024-09-02 23:55:51 +02:00
parent 9ce6f6f73f
commit d4a854fb6e
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/simibubi/create/content/logistics/depot/DepotBehaviour.java
View file

@ -309,7 +309,8 @@ public class DepotBehaviour extends BlockEntityBehaviour {
ItemStack returned = ItemStack.EMPTY; ItemStack returned = ItemStack.EMPTY;
int maxCount = heldItem.stack.getMaxStackSize(); int maxCount = heldItem.stack.getMaxStackSize();
if (maxCount < heldItem.stack.getCount()) boolean stackTooLarge = maxCount < heldItem.stack.getCount();
if (stackTooLarge)
returned = ItemHandlerHelper.copyStackWithSize(heldItem.stack, heldItem.stack.getCount() - maxCount); returned = ItemHandlerHelper.copyStackWithSize(heldItem.stack, heldItem.stack.getCount() - maxCount);
if (simulate) if (simulate)
@ -323,8 +324,11 @@ public class DepotBehaviour extends BlockEntityBehaviour {
AllSoundEvents.DEPOT_PLOP.playOnServer(getWorld(), getPos()); AllSoundEvents.DEPOT_PLOP.playOnServer(getWorld(), getPos());
} }
heldItem = heldItem.copy(); if (stackTooLarge) {
heldItem.stack.setCount(maxCount); heldItem = heldItem.copy();
heldItem.stack.setCount(maxCount);
}
this.heldItem = heldItem; this.heldItem = heldItem;
onHeldInserted.accept(heldItem.stack); onHeldInserted.accept(heldItem.stack);
return returned; return returned;

2
src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java
View file

@ -380,7 +380,7 @@ public class BasinBlockEntity extends SmartBlockEntity implements IHaveGoggleInf
inserter = BlockEntityBehaviour.get(level, be.getBlockPos(), InvManipulationBehaviour.TYPE); inserter = BlockEntityBehaviour.get(level, be.getBlockPos(), InvManipulationBehaviour.TYPE);
} }
if (filter.isRecipeFilter()) if (filter != null && filter.isRecipeFilter())
filter = null; // Do not test spout outputs against the recipe filter filter = null; // Do not test spout outputs against the recipe filter
IItemHandler targetInv = be == null ? null IItemHandler targetInv = be == null ? null