From eb7bb705866a8407c89fd9399722ed65d1b9975c Mon Sep 17 00:00:00 2001 From: altrisi Date: Sun, 21 Feb 2021 12:38:25 +0100 Subject: [PATCH 1/4] Implement query(e,'fire') --- src/main/java/carpet/script/value/EntityValue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index 9504166a..0a1c3506 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -462,7 +462,7 @@ public class EntityValue extends Value return ListValue.of(new NumericValue(look.x),new NumericValue(look.y),new NumericValue(look.z)); }); put("is_burning", (e, a) -> new NumericValue(e.isOnFire())); - //put("fire", (e, a) -> new NumericValue(e.getFire())); needs mixing + put("fire", (e, a) -> new NumericValue(e.getFireTicks())); put("silent", (e, a)-> new NumericValue(e.isSilent())); put("gravity", (e, a) -> new NumericValue(!e.hasNoGravity())); put("immune_to_fire", (e, a) -> new NumericValue(e.isFireImmune())); From f7aa874ae8d19f5b7c3f5139ef968799d57a713c Mon Sep 17 00:00:00 2001 From: DragonEggBedrockBreaking <68545280+DragonEggBedrockBreaking@users.noreply.github.com> Date: Sun, 21 Feb 2021 12:44:02 +0000 Subject: [PATCH 2/4] Update CarpetSettings.java --- src/main/java/carpet/CarpetSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 83c4c3ec..71d70ad2 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -860,7 +860,7 @@ public class CarpetSettings @Rule( desc = "Lightning kills the items that drop when lightning kills an entity", - extra = {"Setting to true will prevent lightning from killing drops", "Fixes (https://bugs.mojang.com/browse/MC-195640)."}, + extra = {"Setting to true will prevent lightning from killing drops", "Fixes (https://bugs.mojang.com/browse/MC-206922)."}, category = {BUGFIX} ) public static boolean lightningKillsDropsFix = false; From 8c517aad918da9d1ad642ddf8f67860e46ae0f65 Mon Sep 17 00:00:00 2001 From: altrisi Date: Sun, 21 Feb 2021 15:57:45 +0100 Subject: [PATCH 3/4] Remove jcenter from settings.gradle --- settings.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 5b60df3d..f91a4fe7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,5 @@ pluginManagement { repositories { - jcenter() maven { name = 'Fabric' url = 'https://maven.fabricmc.net/' From eeddf96abc930eca69dc123c7c6ce1a0ede7eea8 Mon Sep 17 00:00:00 2001 From: DragonEggBedrockBreaking <68545280+DragonEggBedrockBreaking@users.noreply.github.com> Date: Sun, 21 Feb 2021 17:34:50 +0000 Subject: [PATCH 4/4] Update CarpetSettings.java Co-authored-by: altrisi --- src/main/java/carpet/CarpetSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 71d70ad2..97f4d4f5 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -860,7 +860,7 @@ public class CarpetSettings @Rule( desc = "Lightning kills the items that drop when lightning kills an entity", - extra = {"Setting to true will prevent lightning from killing drops", "Fixes (https://bugs.mojang.com/browse/MC-206922)."}, + extra = {"Setting to true will prevent lightning from killing drops", "Fixes [MC-206922](https://bugs.mojang.com/browse/MC-206922)."}, category = {BUGFIX} ) public static boolean lightningKillsDropsFix = false;