From facd8bd4d88c02244a40212b45cd46d0efecd1f3 Mon Sep 17 00:00:00 2001 From: CreepyCre Date: Mon, 6 Sep 2021 22:45:23 +0200 Subject: [PATCH] probably fixes #234 --- .../dimdev/dimdoors/pockets/generator/LazyPocketGenerator.java | 1 + .../java/org/dimdev/dimdoors/world/pocket/PocketDirectory.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/dimdev/dimdoors/pockets/generator/LazyPocketGenerator.java b/src/main/java/org/dimdev/dimdoors/pockets/generator/LazyPocketGenerator.java index ae4b6ded..4e9cde7f 100644 --- a/src/main/java/org/dimdev/dimdoors/pockets/generator/LazyPocketGenerator.java +++ b/src/main/java/org/dimdev/dimdoors/pockets/generator/LazyPocketGenerator.java @@ -49,6 +49,7 @@ public abstract class LazyPocketGenerator extends PocketGenerator { if (nbt.contains("lazy_modifiers")) { NbtList modifiersNbt = nbt.getList("lazy_modifiers", 10); for (int i = 0; i < modifiersNbt.size(); i++) { + // TODO: skip deserialization of single Modifiers on Exception. lazyModifierList.add((LazyModifier) Modifier.deserialize(modifiersNbt.getCompound(i))); } } diff --git a/src/main/java/org/dimdev/dimdoors/world/pocket/PocketDirectory.java b/src/main/java/org/dimdev/dimdoors/world/pocket/PocketDirectory.java index 17984ce8..c2705007 100644 --- a/src/main/java/org/dimdev/dimdoors/world/pocket/PocketDirectory.java +++ b/src/main/java/org/dimdev/dimdoors/world/pocket/PocketDirectory.java @@ -76,7 +76,7 @@ public class PocketDirectory { NbtCompound pocketsNbt = new NbtCompound(); this.pockets.entrySet().parallelStream().unordered().map(entry -> CompletableFuture.supplyAsync(() -> new Pair<>(entry.getKey().toString(), entry.getValue().toNbt(new NbtCompound())))) - .map(CompletableFuture::join).forEach(pair -> pocketsNbt.put(pair.getLeft(), pair.getRight())); + .map(CompletableFuture::join).sequential().forEach(pair -> pocketsNbt.put(pair.getLeft(), pair.getRight())); nbt.put("pockets", pocketsNbt); return nbt;