From ff0016ad0ec37ea1d669dfa0c2e9b0deed77b8c4 Mon Sep 17 00:00:00 2001 From: coco0325 Date: Sun, 22 Dec 2019 01:32:20 +0800 Subject: [PATCH] Update OilPump.java --- .../machines/electric/geo/OilPump.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/OilPump.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/OilPump.java index 9e66f82f3..158ffa099 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/OilPump.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/OilPump.java @@ -97,29 +97,27 @@ public abstract class OilPump extends AContainer { } } else { + if (!inv.fits(SlimefunItems.BUCKET_OF_OIL, getOutputSlots())) { + return; + } for (int slot : getInputSlots()) { if (SlimefunManager.isItemSimilar(inv.getItemInSlot(slot), new ItemStack(Material.BUCKET), true)) { OreGenResource oil = OreGenSystem.getResource("Oil"); Chunk chunk = b.getChunk(); int supplies = OreGenSystem.getSupplies(oil, chunk, false); - if(supplies > 0){ + if(supplies > 0) { MachineRecipe r = new MachineRecipe(26, new ItemStack[0], new ItemStack[] {SlimefunItems.BUCKET_OF_OIL}); - if (!inv.fits(SlimefunItems.BUCKET_OF_OIL, getOutputSlots())) { - return; - } - inv.replaceExistingItem(slot, InvUtils.decreaseItem(inv.getItemInSlot(slot), 1)); processing.put(b, r); progress.put(b, r.getTicks()); OreGenSystem.setSupplies(oil, chunk, supplies - 1); break; - }else{ - ItemStack item = BlockStorage.getInventory(b).getItemInSlot(slot); - ItemStack[] abucket = new ItemStack[1]; - abucket[0]=item.clone(); + } + else { + ItemStack item = BlockStorage.getInventory(b).getItemInSlot(slot).clone(); BlockStorage.getInventory(b).replaceExistingItem(slot, null); - pushItems(b, abucket); + pushItems(b, item); } } }