Fix priority scheduling logic

Tuinity · Jul 17, 2024 · 8bc6b3c · 8bc6b3c
1 parent 2d5fb18
commit 8bc6b3c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java
@@ -534,7 +534,7 @@ public PrioritisedExecutor.Priority getEffectivePriority(final PrioritisedExecut
             return us == null ? dfl : us;
         }
         if (us == null) {
-            return dfl;
+            return neighbour;
         }
 
         return PrioritisedExecutor.Priority.max(us, neighbour);
@@ -580,7 +580,7 @@ public void recalculateNeighbourPriorities() {
 
     // must hold scheduling lock
     public void raisePriority(final PrioritisedExecutor.Priority priority) {
-        if (this.priority == null || this.priority.isHigherOrEqualPriority(priority)) {
+        if (this.priority != null && this.priority.isHigherOrEqualPriority(priority)) {
             return;
         }
         this.setPriority(priority);
@@ -611,7 +611,7 @@ public void setPriority(final PrioritisedExecutor.Priority priority) {
 
     // must hold scheduling lock
     public void lowerPriority(final PrioritisedExecutor.Priority priority) {
-        if (this.priority == null || this.priority.isLowerOrEqualPriority(priority)) {
+        if (this.priority != null && this.priority.isLowerOrEqualPriority(priority)) {
             return;
         }
         this.setPriority(priority);