From 69e9de06d4e7f8825ba549e5411afecc5c85c0fd Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 16 Jun 2020 10:33:47 -0300 Subject: [PATCH 1/2] making sure that any source can query entities since they already can run code. --- src/main/java/carpet/script/value/EntityValue.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index 0b053f2c..557ee4eb 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -87,11 +87,11 @@ public class EntityValue extends Value EntitySelector entitySelector = selectorCache.get(selector); if (entitySelector != null) { - return entitySelector.getEntities(source); + return entitySelector.getEntities(source.withMaxLevel(4)); } entitySelector = new EntitySelectorReader(new StringReader(selector), true).read(); selectorCache.put(selector, entitySelector); - return entitySelector.getEntities(source); + return entitySelector.getEntities(source.withMaxLevel(4)); } catch (CommandSyntaxException e) { From 3273470871abcc54d32fc7ff24b45c0138fa226f Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 16 Jun 2020 17:20:39 -0300 Subject: [PATCH 2/2] 1.3.31 --- gradle.properties | 2 +- src/main/java/carpet/CarpetSettings.java | 2 +- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index de46d355..99380f82 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.8.7+build.201 # Mod Properties - mod_version = 1.3.30+v200615 + mod_version = 1.3.31+v200616 maven_group = carpet archives_base_name = fabric-carpet diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 1570341a..e6ef5646 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -34,7 +34,7 @@ import static carpet.settings.RuleCategory.CLIENT; @SuppressWarnings("CanBeFinal") public class CarpetSettings { - public static final String carpetVersion = "1.3.30+v200615"; + public static final String carpetVersion = "1.3.31+v200616"; public static final Logger LOG = LogManager.getLogger(); public static boolean skipGenerationChecks = false; public static boolean impendingFillSkipUpdates = false; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index f50727cd..099e824f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "carpet", - "version": "1.3.30", + "version": "1.3.31", "name": "Carpet Mod in Fabric", "description": "Carpet made out of fabric",