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

Merge pull request #2189 from Fox2Code/1.4.7-concurrent-fix

Browse Source 
Fix ConcurrentModificationException caused by timers
This commit is contained in:
Jonathan Coates
2025-04-30 19:21:17 +01:00
committed by GitHub
parent 22c094192b 00e57227dc
commit fc66d15012
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/dan200/computercraft/core/apis/OSAPI.java
View File

@@ -203,9 +203,11 @@ public class OSAPI implements ILuaAPI {
*/ */
@LuaFunction @LuaFunction
public final int startTimer(double timer) throws LuaException { public final int startTimer(double timer) throws LuaException {
synchronized (timers) {
timers.put(nextTimerToken, new Timer((int) Math.round(checkFinite(0, timer) / 0.05))); timers.put(nextTimerToken, new Timer((int) Math.round(checkFinite(0, timer) / 0.05)));
return nextTimerToken++; return nextTimerToken++;
} }
}
/** /**
* Cancels a timer previously started with startTimer. This will stop the * Cancels a timer previously started with startTimer. This will stop the
@@ -217,8 +219,10 @@ public class OSAPI implements ILuaAPI {
*/ */
@LuaFunction @LuaFunction
public final void cancelTimer(int token) { public final void cancelTimer(int token) {
synchronized (timers) {
timers.remove(token); timers.remove(token);
} }
}
/** /**
* Sets an alarm that will fire at the specified in-game time. When it * Sets an alarm that will fire at the specified in-game time. When it