Merge remote-tracking branch 'origin/1.20' into 1.21.1

embeddedt · embeddedt · commit 387c94296b29 · 2025-06-05T22:07:36.000-04:00
diff --git a/common/src/main/java/org/embeddedt/modernfix/dfu/DFUBlaster.java b/common/src/main/java/org/embeddedt/modernfix/dfu/DFUBlaster.java
@@ -43,7 +43,7 @@ public static void blastMaps() {
     }
 
     public static void kick() {
-        NEXT_WAKE_TIME.getAndAdd(DELAY_TIME);
+        NEXT_WAKE_TIME.set(System.nanoTime() + DELAY_TIME);
     }
 
     static class CleanerThread extends Thread {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public static void blastMaps() {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public static void kick() {`
`46`		`- NEXT_WAKE_TIME.getAndAdd(DELAY_TIME);`
	`46`	`+ NEXT_WAKE_TIME.set(System.nanoTime() + DELAY_TIME);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`static class CleanerThread extends Thread {`