From fb40120460215e5856ff6948002e768534ab0fcf Mon Sep 17 00:00:00 2001 From: gnembon Date: Thu, 13 May 2021 02:00:05 -0300 Subject: [PATCH] cluenap --- src/main/java/carpet/helpers/FeatureGenerator.java | 2 +- src/main/java/carpet/script/argument/FileArgument.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index 07a2aee4..af00e669 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -142,7 +142,7 @@ public class FeatureGenerator findFirst().map(Map.Entry::getValue).orElse(null); } - synchronized public static StructureStart shouldStructureStartAt(ServerWorld world, BlockPos pos, StructureFeature structure, boolean computeBox) + public static StructureStart shouldStructureStartAt(ServerWorld world, BlockPos pos, StructureFeature structure, boolean computeBox) { long seed = world.getSeed(); ChunkGenerator generator = world.getChunkManager().getChunkGenerator(); diff --git a/src/main/java/carpet/script/argument/FileArgument.java b/src/main/java/carpet/script/argument/FileArgument.java index e8d1f2f8..c27e4acc 100644 --- a/src/main/java/carpet/script/argument/FileArgument.java +++ b/src/main/java/carpet/script/argument/FileArgument.java @@ -184,8 +184,7 @@ public class FileArgument } catch (FileSystemNotFoundException | IOException fsnfe) { - return null; // undr java 16 no file throws IOException - will take care of it later - //throw new ThrowStatement("Unable to open zip file: "+zipContainer, Throwables.IO_EXCEPTION); + throw new ThrowStatement("Unable to open zip file: "+zipContainer, Throwables.IO_EXCEPTION); } } return zfs.getPath(resource+(isFolder?"/":type.extension));