Fix Timespan intersection hopefully for the last time now (lets see h…

…ow many bugs are in there)
Torridity · Oct 20, 2020 · 5b5f256 · 5b5f256
1 parent 13671bb
commit 5b5f256
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Core/src/main/java/de/tor/tribes/types/TimeSpan.java b/Core/src/main/java/de/tor/tribes/types/TimeSpan.java
@@ -234,7 +234,7 @@ public boolean intersects(TimeSpan pSpan) {
           if(!pSpan.isValidAtEveryDay()) {
             Long otherStart = DateUtils.getFragmentInMilliseconds(new Date(theOtherSpan.getMinimum()), Calendar.DATE);
             Long otherEnd = DateUtils.getFragmentInMilliseconds(new Date(theOtherSpan.getMaximum()), Calendar.DATE);
-            theOtherSpan = Range.between(otherStart, otherEnd);
+            theOtherSpan = Range.between(otherStart, otherEnd - 1);
           } else {
             theOtherSpan = Range.between(theOtherSpan.getMinimum(), theOtherSpan.getMaximum() - 1);
           }
@@ -274,6 +274,9 @@ public boolean intersects(TimeSpan pSpan) {
         }
     }
 
+    thisSpan = Range.between(thisSpan.getMinimum(), thisSpan.getMaximum() - 1);
+    theOtherSpan = Range.between(theOtherSpan.getMinimum(), theOtherSpan.getMaximum() - 1);
+
     return thisSpan.isOverlappedBy(theOtherSpan);
   }