Skip to content

Commit e0eb28f

Browse files
Fix NPE from empty region iterator
When attempting to get the region block iterator from an empty region iterator, an error would occur.
1 parent 5e416b5 commit e0eb28f

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/main/java/org/skriptlang/skriptworldguard/worldguard/RegionUtils.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.ArrayList;
2323
import java.util.Arrays;
2424
import java.util.Collection;
25+
import java.util.Collections;
2526
import java.util.Iterator;
2627
import java.util.List;
2728
import java.util.stream.Collectors;
@@ -163,6 +164,9 @@ public static boolean canBuild(Player player, WorldGuardRegion... regions) {
163164
* @return An iterator over the blocks of the regions of {@code regionsIterator}.
164165
*/
165166
public static Iterator<Block> getRegionBlockIterator(Iterator<WorldGuardRegion> regionIterator) {
167+
if (!regionIterator.hasNext()) { // no blocks to iterate over
168+
return Collections.emptyIterator();
169+
}
166170
return new Iterator<>() {
167171
Iterator<Block> currentBlockIterator = nextIterator();
168172

0 commit comments

Comments
 (0)