Merge remote-tracking branch 'origin/master' into develop-fix

# Conflicts:
#	pom.xml
This commit is contained in:
BONNe 2022-10-11 09:55:16 +03:00
commit b48a5a73b8
3 changed files with 9 additions and 9 deletions

View File

@ -16,7 +16,7 @@ import java.util.stream.Collectors;
public class PasteHandlerImpl implements PasteHandler { public class PasteHandlerImpl implements PasteHandler {
@Override @Override
public CompletableFuture<Void> pasteBlocks(Island island, World world, Map<Location, BlueprintBlock> blockMap) { public CompletableFuture<Void> pasteBlocks(Island island, World world, Map<Location, BlueprintBlock> blockMap) {
return blockMap.entrySet().parallelStream() return blockMap.entrySet().stream()
.map(entry -> DefaultPasteUtil.setBlock(island, entry.getKey(), entry.getValue())) .map(entry -> DefaultPasteUtil.setBlock(island, entry.getKey(), entry.getValue()))
.collect( .collect(
Collectors.collectingAndThen( Collectors.collectingAndThen(
@ -28,7 +28,7 @@ public class PasteHandlerImpl implements PasteHandler {
@Override @Override
public CompletableFuture<Void> pasteEntities(Island island, World world, Map<Location, List<BlueprintEntity>> entityMap) { public CompletableFuture<Void> pasteEntities(Island island, World world, Map<Location, List<BlueprintEntity>> entityMap) {
return entityMap.entrySet().parallelStream() return entityMap.entrySet().stream()
.map(entry -> DefaultPasteUtil.setEntity(island, entry.getKey(), entry.getValue())) .map(entry -> DefaultPasteUtil.setEntity(island, entry.getKey(), entry.getValue()))
.collect( .collect(
Collectors.collectingAndThen( Collectors.collectingAndThen(