From 777b54e69641cac487e299d9f70e5da9e2a9dae5 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Fri, 20 Mar 2020 11:37:37 +0100 Subject: [PATCH] Fixed Android Fuel Interfaces --- CHANGELOG.md | 2 ++ .../items/androids/ProgrammableAndroid.java | 15 ++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9609cab8..6487507b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -78,6 +78,8 @@ * Fixed #1719 * Fixed death waypoints not having the correct texture * Fixed Androids having no texture when moving +* Fixed Androids not taking fuel from interfaces +* Fixed #1721 ## Release Candidate 9 (07 Mar 2020) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java index 7ce7ee04d..9e7996ce7 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java @@ -233,7 +233,7 @@ public abstract class ProgrammableAndroid extends Android implements InventoryBl return; } - if (BlockStorage.getLocationInfo(b.getLocation(), "paused").equals("false")) { + if ("false".equals(BlockStorage.getLocationInfo(b.getLocation(), "paused"))) { BlockMenu menu = BlockStorage.getInventory(b); float fuel = Float.parseFloat(BlockStorage.getLocationInfo(b.getLocation(), "fuel")); @@ -408,18 +408,19 @@ public abstract class ProgrammableAndroid extends Android implements InventoryBl private boolean insertFuel(BlockMenu menu, Inventory dispenser, int slot, ItemStack currentFuel, ItemStack newFuel) { if (currentFuel == null) { - menu.replaceExistingItem(43, item); + menu.replaceExistingItem(43, newFuel); dispenser.setItem(slot, null); return true; } - else if (SlimefunManager.isItemSimilar(item, currentFuel, true)) { - int rest = item.getType().getMaxStackSize() - currentFuel.getAmount(); + else if (SlimefunManager.isItemSimilar(newFuel, currentFuel, true)) { + int rest = newFuel.getType().getMaxStackSize() - currentFuel.getAmount(); if (rest > 0) { - int amount = item.getAmount() > rest ? rest : item.getAmount(); - menu.replaceExistingItem(43, new CustomItem(item, currentFuel.getAmount() + amount)); - ItemUtils.consumeItem(item, amount, false); + int amount = newFuel.getAmount() > rest ? rest : newFuel.getAmount(); + menu.replaceExistingItem(43, new CustomItem(newFuel, currentFuel.getAmount() + amount)); + ItemUtils.consumeItem(newFuel, amount, false); } + return true; }