fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix stopping already stopped Stopwatches in CraftingJob

Browse Source 
Resolves #417
Co-authored-by: frankdai320 <frankdai320@gmail.com>
This commit is contained in:
NotMyWing
2024-05-17 19:31:31 +11:00
parent e471293e60
commit fd188dc96c
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/crafting/CraftingJob.java
+10 -6
View File
@@ -131,7 +131,7 @@ public class CraftingJob implements Runnable, ICraftingJob {
craftingInventory.ignore(this.output); craftingInventory.ignore(this.output);
this.availableCheck = new MECraftingInventory(this.original, false, false, false); this.availableCheck = new MECraftingInventory(this.original, false, false, false);
craftingTreeWatch.start(); craftingTreeWatch.reset().start();
this.getTree().request(craftingInventory, this.output.getStackSize(), this.actionSrc); this.getTree().request(craftingInventory, this.output.getStackSize(), this.actionSrc);
craftingTreeWatch.stop(); craftingTreeWatch.stop();
this.getTree().dive(this); this.getTree().dive(this);
@@ -170,10 +170,8 @@ public class CraftingJob implements Runnable, ICraftingJob {
} else { } else {
this.logCraftingJob("real, failed", craftingTreeWatch); this.logCraftingJob("real, failed", craftingTreeWatch);
} }
} catch (final CraftBranchFailure e1) { } catch (final CraftBranchFailure | CraftingCalculationFailure e1) {
AELog.debug(e1); AELog.debug(e1);
} catch (final CraftingCalculationFailure f) {
AELog.debug(f);
} catch (final InterruptedException e1) { } catch (final InterruptedException e1) {
AELog.crafting("Crafting calculation canceled."); AELog.crafting("Crafting calculation canceled.");
this.finish(); this.finish();
@@ -202,8 +200,14 @@ public class CraftingJob implements Runnable, ICraftingJob {
synchronized (this.monitor) { synchronized (this.monitor) {
if (this.tickSpreadingWatch.elapsed(TimeUnit.MICROSECONDS) > this.time) { if (this.tickSpreadingWatch.elapsed(TimeUnit.MICROSECONDS) > this.time) {
this.running = false; this.running = false;
this.craftingTreeWatch.stop(); if (this.craftingTreeWatch.isRunning()) {
this.tickSpreadingWatch.stop(); this.craftingTreeWatch.stop();
}
if (this.tickSpreadingWatch.isRunning()) {
this.tickSpreadingWatch.stop();
}
this.monitor.notify(); this.monitor.notify();
} }