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/' diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 96bde6ee..c6ff6160 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -864,7 +864,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 [MC-206922](https://bugs.mojang.com/browse/MC-206922)."}, category = {BUGFIX} ) public static boolean lightningKillsDropsFix = false; diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index 4d60505c..a4c5d59a 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -477,7 +477,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()));