Upstream/EpicFurnaces
1
0
Fork 0
mirror of https://github.com/songoda/EpicFurnaces.git synced 2024-11-30 22:03:22 +01:00
Code Issues Projects Releases Wiki Activity

Mitigated strange spigot bug with blast furnaces and smokers.

Browse Source
This commit is contained in:
Brianna 2019-11-09 12:31:40 -05:00
parent 46f144e922
commit 660ab11e88
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/songoda/epicfurnaces/EpicFurnaces.java
View File

@ -167,7 +167,7 @@ public class EpicFurnaces extends SongodaPlugin {
org.bukkit.block.Furnace furnaceBlock = ((org.bukkit.block.Furnace) state);
int performance = (furnaceBlock.getCookTime() - furnace.getPerformanceTotal()) <= 0 ? 0 : furnace.getPerformanceTotal();
int performance = (furnaceBlock.getCookTime() - furnace.getPerformanceTotal(furnaceBlock.getType())) <= 0 ? 0 : furnace.getPerformanceTotal(furnaceBlock.getType());
float percent = (float) (furnaceBlock.getCookTime() - performance) / (200 - performance);

16
src/main/java/com/songoda/epicfurnaces/furnace/Furnace.java
View File

@ -186,13 +186,14 @@ public class Furnace {
if (!block.getType().name().contains("FURNACE") && !block.getType().name().contains("SMOKER")) return;
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> {
int num = getPerformanceTotal();
int num = getPerformanceTotal(block.getType());
if (num > 200)
num = 200;
int max = (block.getType().name().contains("BLAST") || block.getType().name().contains("SMOKER") ? 100 : 200);
if (num >= max)
num = max - 1;
if (num != 0) {
BlockState bs = (block.getState()); // max is 200
BlockState bs = (block.getState());
((org.bukkit.block.Furnace) bs).setCookTime(Short.parseShort(Integer.toString(num)));
bs.update();
}
@ -220,13 +221,14 @@ public class Furnace {
}
public int getPerformanceTotal() {
String equation = "(" + level.getPerformance() + " / 100) * 200";
public int getPerformanceTotal(Material material) {
String cap = (material.name().contains("BLAST") || material.name().contains("SMOKER") ? "100" : "200");
String equation = "(" + level.getPerformance() + " / 100) * " + cap;
try {
if (!cache.containsKey(equation)) {
ScriptEngineManager mgr = new ScriptEngineManager();
ScriptEngine engine = mgr.getEngineByName("JavaScript");
int num = (int) Math.round(Double.parseDouble(engine.eval("(" + level.getPerformance() + " / 100) * 200").toString()));
int num = (int) Math.round(Double.parseDouble(engine.eval("(" + level.getPerformance() + " / 100) * " + cap).toString()));
cache.put(equation, num);
return num;
} else {