EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 14:46:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixes #3344, Wrong iterator algorithm in PlotRangeIterator (#3345)

Browse Source
This commit is contained in:
Pascal Bürklin 2021-11-23 20:52:23 +01:00 committed by GitHub
parent a9f08bc885
commit 8f3fa419c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/main/java/com/plotsquared/core/plot/PlotId.java
View File

@ -302,7 +302,7 @@ public final class PlotId {
// first increase y, then x // first increase y, then x
if (this.y == this.end.getY()) { if (this.y == this.end.getY()) {
this.x++; this.x++;
this.y = 0; this.y = this.start.getY();
} else { } else {
this.y++; this.y++;
} }

16
Core/src/test/java/com/plotsquared/core/plot/PlotRangeIteratorTest.java
View File

@ -25,7 +25,8 @@
*/ */
package com.plotsquared.core.plot; package com.plotsquared.core.plot;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -33,6 +34,7 @@ import java.util.NoSuchElementException;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@ -106,4 +108,16 @@ public class PlotRangeIteratorTest {
assertThrows(NoSuchElementException.class, range::next); assertThrows(NoSuchElementException.class, range::next);
} }
@Test
public void resetYOfIteratorToStart() {
PlotId id00 = PlotId.of(0, 1);
PlotId id01 = PlotId.of(1, 2);
PlotId.PlotRangeIterator range = PlotId.PlotRangeIterator.range(id00, id01);
for (int i = 0; i < 4; i++) {
assertNotEquals(0, range.next().getY());
}
assertFalse(range.hasNext());
assertThrows(NoSuchElementException.class, range::next);
}
} }