From 340fc046d0343da12724c6f729143677ae97af6c Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Fri, 11 May 2018 13:11:13 +0200 Subject: [PATCH] Fixed Reactor Overflows --- .../Objects/SlimefunItem/abstractItems/AReactor.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java index 1d02c7d88..a589acbc5 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java @@ -308,11 +308,13 @@ public abstract class AReactor extends SlimefunItem { extraTick(l); int timeleft = progress.get(l); if (timeleft > 0) { - boolean should_charge = ChargableBlock.getMaxCharge(l) - ChargableBlock.getCharge(l) >= getEnergyProduction(); - if (should_charge) { + int produced = getEnergyProduction(); + int space = ChargableBlock.getMaxCharge(l) - ChargableBlock.getCharge(l); + if (space >= produced) { ChargableBlock.addCharge(l, getEnergyProduction()); + space -= produced; } - if (should_charge || !BlockStorage.getBlockInfo(l, "reactor-mode").equals("generator")) { + if (space >= produced || !BlockStorage.getBlockInfo(l, "reactor-mode").equals("generator")) { progress.put(l, timeleft - 1); Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new Runnable() {