remove possibility for race condition

IntellectualSites · Oct 11, 2023 · 14804a0 · 14804a0
1 parent 2142257
commit 14804a0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
@@ -406,12 +406,16 @@ public void setTimezone(ZoneId timezone) {
      */
     public void clearHistory() {
         //FAWE start
-        if (Fawe.isMainThread() && historyWriteLock.isLocked()) {
+        if (Fawe.isMainThread() && !historyWriteLock.tryLock()) {
             // Do not make main thread wait if we cannot immediately clear history (on player logout usually)
             TaskManager.taskManager().async(this::clearHistoryTask);
             return;
         }
-        clearHistoryTask();
+        try {
+            clearHistoryTask();
+        } finally {
+            historyWriteLock.unlock();
+        }
     }
 
     private void clearHistoryTask() {