mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-06 08:22:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'mc-1.13.x' into mc-1.14-fabric

Browse Source
This commit is contained in:
SquidDev
2019-05-06 21:53:59 +01:00
parent e6094a59fa e0660b1dab
commit b0d9dc0b88
6 changed files with 392 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/dan200/computercraft/core/computer/MainThread.java
View File

@@ -134,7 +134,7 @@ public final class MainThread
// Of course, we'll go over the MAX_TICK_TIME most of the time, but eventually that overrun will accumulate
// and we'll skip a whole tick - bringing the average back down again.
currentTick++;
budget += Math.min( budget + ComputerCraft.maxMainGlobalTime, ComputerCraft.maxMainGlobalTime );
budget = Math.min( budget + ComputerCraft.maxMainGlobalTime, ComputerCraft.maxMainGlobalTime );
canExecute = budget > 0;
// Cool down any warm computers.

2
src/main/java/dan200/computercraft/core/computer/MainThreadExecutor.java
View File

@@ -224,7 +224,7 @@ final class MainThreadExecutor implements IWorkMonitor
{
state = State.COOLING;
currentTick = MainThread.currentTick();
budget += Math.min( budget + ComputerCraft.maxMainComputerTime, ComputerCraft.maxMainComputerTime );
budget = Math.min( budget + ComputerCraft.maxMainComputerTime, ComputerCraft.maxMainComputerTime );
if( budget < ComputerCraft.maxMainComputerTime ) return false;
state = State.COOL;