From 2aeefab235a1f000271bd0dda72d05db5b89b0ce Mon Sep 17 00:00:00 2001 From: dNiym Date: Wed, 21 Aug 2019 21:50:32 -0400 Subject: [PATCH 1/2] Fix energy regulators when exploded --- src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java b/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java index fe186af61..5af8d7135 100644 --- a/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java +++ b/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java @@ -141,12 +141,14 @@ public class EnergyNet extends Network { EnergyHologram.update(b, "&4No Energy Network found"); } else { + HashSet exploded = new HashSet<>(); for (final Location source: input) { long timestamp = System.currentTimeMillis(); SlimefunItem item = BlockStorage.check(source); double energy = item.getEnergyTicker().generateEnergy(source, item, BlockStorage.getLocationInfo(source)); if (item.getEnergyTicker().explode(source)) { + exploded.add(source); BlockStorage.clearBlockInfo(source); Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { source.getBlock().setType(Material.LAVA); @@ -159,6 +161,8 @@ public class EnergyNet extends Network { TickerTask.block_timings.put(source, System.currentTimeMillis() - timestamp); } + input.removeAll(exploded); + for (Location battery: storage) { supply = supply + ChargableBlock.getCharge(battery); } From 5c68c07ccac368ec319e9e1dd9a41d150090e0e5 Mon Sep 17 00:00:00 2001 From: dNiym Date: Wed, 21 Aug 2019 21:52:36 -0400 Subject: [PATCH 2/2] typo fix --- src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java b/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java index 5af8d7135..83117afbd 100644 --- a/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java +++ b/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java @@ -141,7 +141,7 @@ public class EnergyNet extends Network { EnergyHologram.update(b, "&4No Energy Network found"); } else { - HashSet exploded = new HashSet<>(); + Set exploded = new HashSet<>(); for (final Location source: input) { long timestamp = System.currentTimeMillis(); SlimefunItem item = BlockStorage.check(source);