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

fix dismantling storage blocks not checking stacksize (#2970)

Browse Source
This commit is contained in:
Darkere
2021-05-12 14:55:35 +02:00
committed by GitHub
parent 380b5e4394
commit 315149b1d2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java
View File

@@ -64,6 +64,7 @@ public class StorageBlockItem extends BaseBlockItem {
@Override @Override
public ActionResult<ItemStack> onItemRightClick(World world, PlayerEntity player, Hand hand) { public ActionResult<ItemStack> onItemRightClick(World world, PlayerEntity player, Hand hand) {
ItemStack storageStack = player.getHeldItem(hand); ItemStack storageStack = player.getHeldItem(hand);
int count = storageStack.getCount();
if (!world.isRemote && player.isCrouching() && type != ItemStorageType.CREATIVE) { if (!world.isRemote && player.isCrouching() && type != ItemStorageType.CREATIVE) {
UUID diskId = null; UUID diskId = null;
@@ -77,6 +78,7 @@ public class StorageBlockItem extends BaseBlockItem {
// Newly created storages won't have a tag yet, so allow invalid disks as well. // Newly created storages won't have a tag yet, so allow invalid disks as well.
if (disk == null || disk.getStored() == 0) { if (disk == null || disk.getStored() == 0) {
ItemStack storagePart = new ItemStack(StoragePartItem.getByType(type)); ItemStack storagePart = new ItemStack(StoragePartItem.getByType(type));
storagePart.setCount(count);
if (!player.inventory.addItemStackToInventory(storagePart.copy())) { if (!player.inventory.addItemStackToInventory(storagePart.copy())) {
InventoryHelper.spawnItemStack(world, player.getPosX(), player.getPosY(), player.getPosZ(), storagePart); InventoryHelper.spawnItemStack(world, player.getPosX(), player.getPosY(), player.getPosZ(), storagePart);
@@ -87,7 +89,9 @@ public class StorageBlockItem extends BaseBlockItem {
API.instance().getStorageDiskManager((ServerWorld) world).markForSaving(); API.instance().getStorageDiskManager((ServerWorld) world).markForSaving();
} }
return new ActionResult<>(ActionResultType.SUCCESS, new ItemStack(RSBlocks.MACHINE_CASING.get())); ItemStack stack = new ItemStack(RSBlocks.MACHINE_CASING.get());
stack.setCount(count);
return new ActionResult<>(ActionResultType.SUCCESS, stack);
} }
} }