mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Fixes #2009

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-06-20 18:52:30 +02:00
parent 1456245ee0
commit 907fb1566a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -31,6 +31,7 @@
#### Fixes
* Fixed #2005
* Fixed #2009
## Release Candidate 13 (16 Jun 2020)
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#13

13
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricGoldPan.java
View File

@ -64,7 +64,10 @@ public abstract class ElectricGoldPan extends AContainer implements RecipeDispla
ChestMenuUtils.updateProgressbar(menu, 22, timeleft, processing.get(b).getTicks(), getProgressBar());
if (ChargableBlock.isChargable(b)) {
if (ChargableBlock.getCharge(b) < getEnergyConsumption()) return;
if (ChargableBlock.getCharge(b) < getEnergyConsumption()) {
return;
}
ChargableBlock.addCharge(b, -getEnergyConsumption());
progress.put(b, timeleft - 1);
}
@ -76,10 +79,16 @@ public abstract class ElectricGoldPan extends AContainer implements RecipeDispla
if (ChargableBlock.getCharge(b) < getEnergyConsumption()) {
return;
}
ChargableBlock.addCharge(b, -getEnergyConsumption());
menu.replaceExistingItem(22, new CustomItem(new ItemStack(Material.BLACK_STAINED_GLASS_PANE), " "));
menu.pushItem(processing.get(b).getOutput()[0].clone(), getOutputSlots());
ItemStack output = processing.get(b).getOutput()[0];
if (output.getType() != Material.AIR) {
menu.pushItem(output.clone(), getOutputSlots());
}
progress.remove(b);
processing.remove(b);