mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-05-24 10:14:10 +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
commit fc66d15012
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,8 +203,10 @@ public class OSAPI implements ILuaAPI {
*/ */
@LuaFunction @LuaFunction
public final int startTimer(double timer) throws LuaException { public final int startTimer(double timer) throws LuaException {
timers.put(nextTimerToken, new Timer((int) Math.round(checkFinite(0, timer) / 0.05))); synchronized (timers) {
return nextTimerToken++; timers.put(nextTimerToken, new Timer((int) Math.round(checkFinite(0, timer) / 0.05)));
return nextTimerToken++;
}
} }
/** /**
@ -217,7 +219,9 @@ public class OSAPI implements ILuaAPI {
*/ */
@LuaFunction @LuaFunction
public final void cancelTimer(int token) { public final void cancelTimer(int token) {
timers.remove(token); synchronized (timers) {
timers.remove(token);
}
} }
/** /**