From 1edd06605ba786358c545a5eb9f0a792410a5ecf Mon Sep 17 00:00:00 2001 From: gnembon <41132274+gnembon@users.noreply.github.com> Date: Thu, 24 Nov 2022 06:10:18 +0100 Subject: [PATCH] 1.19.3-pre2 --- gradle.properties | 4 ++-- src/main/java/carpet/helpers/FeatureGenerator.java | 2 +- src/main/java/carpet/script/value/EntityValue.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 420cdfcb..80569710 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,9 +4,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=1.19.3-pre1 + minecraft_version=1.19.3-pre2 loader_version=0.14.10 - fabric_version=0.66.4+1.19.3 + fabric_version=0.67.1+1.19.3 # Mod Properties mod_version = 1.4.88 diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index f0bf6d5a..3eefd7ab 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -219,7 +219,7 @@ public class FeatureGenerator if (!computeBox) { Holder genBiome = generator.getBiomeSource().getNoiseBiome(QuartPos.fromBlock(pos.getX()), QuartPos.fromBlock(pos.getY()), QuartPos.fromBlock(pos.getZ()), seed.sampler()); - if (structureBiomes.contains(genBiome) && structure.findGenerationPoint(new Structure.GenerationContext( + if (structureBiomes.contains(genBiome) && structure.findValidGenerationPoint(new Structure.GenerationContext( world.registryAccess(), generator, generator.getBiomeSource(), seed, world.getStructureManager(), world.getSeed(), chunkPos, world, structureBiomes::contains )).isPresent()) diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index 8da94c2d..6141e69e 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -1549,7 +1549,7 @@ public class EntityValue extends Value put("gamemode", (e,v)->{ if(!(e instanceof ServerPlayer)) return; GameType toSet = v instanceof NumericValue ? - GameType.byId(((NumericValue) v).getInt(), null) : + GameType.byId(((NumericValue) v).getInt()) : GameType.byName(v.getString().toLowerCase(Locale.ROOT), null); if (toSet != null) ((ServerPlayer) e).setGameMode(toSet); });