From 2ec095a1bfb558c02e667c7ee4c7af054e8ddb73 Mon Sep 17 00:00:00 2001 From: gnembon Date: Sat, 2 May 2020 20:19:19 -0300 Subject: [PATCH] oupsie --- docs/scarpet/resources/editors/idea/2.txt | 2 ++ docs/scarpet/resources/editors/npp/scarpet.xml | 4 ++-- src/main/java/carpet/script/CarpetExpression.java | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/scarpet/resources/editors/idea/2.txt b/docs/scarpet/resources/editors/idea/2.txt index f12cde37..15f9ee89 100644 --- a/docs/scarpet/resources/editors/idea/2.txt +++ b/docs/scarpet/resources/editors/idea/2.txt @@ -86,10 +86,12 @@ sky_light solid sound spawn +spawn_potential stack_limit statistic store_app_data structures +structure_eligibility structure_references suffocates tick_time diff --git a/docs/scarpet/resources/editors/npp/scarpet.xml b/docs/scarpet/resources/editors/npp/scarpet.xml index 33be1144..3994ced4 100644 --- a/docs/scarpet/resources/editors/npp/scarpet.xml +++ b/docs/scarpet/resources/editors/npp/scarpet.xml @@ -54,8 +54,8 @@ hardness blast_resistance top loaded suffocates power ticks_randomly update block_tick random_tick in_slime_chunk set without_updates blocks_movement block_sound material map_colour property block_properties block_data poi set_poi - place_item set_biome biome loaded_status generation_status inhabited_time chunk_tickets - structures structure_references set_structure reset_chunk + place_item set_biome biome loaded_status generation_status inhabited_time spawn_potential chunk_tickets + structure_eligibility structures structure_references set_structure reset_chunk scoreboard scoreboard_add scoreboard_remove scoreboard_display diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 8af5adf7..c5e71780 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -1152,7 +1152,7 @@ public class CarpetExpression if (!needSize) return LazyValue.TRUE; Value ret = ListValue.of( ListValue.of(new NumericValue(box.minX), new NumericValue(box.minY), new NumericValue(box.minZ)), - ListValue.of(new NumericValue(box.minX), new NumericValue(box.minY), new NumericValue(box.minZ)) + ListValue.of(new NumericValue(box.maxX), new NumericValue(box.maxY), new NumericValue(box.maxZ)) ); return (_c, _t) -> ret; } @@ -1164,7 +1164,7 @@ public class CarpetExpression Value key = new StringValue(FeatureGenerator.structureToFeature.get(str.getName()).get(0)); ret.put(key, (!needSize)?Value.NULL:ListValue.of( ListValue.of(new NumericValue(box.minX), new NumericValue(box.minY), new NumericValue(box.minZ)), - ListValue.of(new NumericValue(box.minX), new NumericValue(box.minY), new NumericValue(box.minZ)) + ListValue.of(new NumericValue(box.maxX), new NumericValue(box.maxY), new NumericValue(box.maxZ)) )); } Value retMap = MapValue.wrap(ret);