Merge branch 'master' into 1.17
This commit is contained in:
commit
659c3ffa6e
3 files changed
+2
-3
No files matched your search
@@ -1,6 +1,5 @@
|
|||||||
pluginManagement {
|
pluginManagement {
|
||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
|
||||||
maven {
|
maven {
|
||||||
name = 'Fabric'
|
name = 'Fabric'
|
||||||
url = 'https://maven.fabricmc.net/'
|
url = 'https://maven.fabricmc.net/'
|
||||||
|
|||||||
@@ -864,7 +864,7 @@ public class CarpetSettings
|
|||||||
|
|
||||||
@Rule(
|
@Rule(
|
||||||
desc = "Lightning kills the items that drop when lightning kills an entity",
|
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}
|
category = {BUGFIX}
|
||||||
)
|
)
|
||||||
public static boolean lightningKillsDropsFix = false;
|
public static boolean lightningKillsDropsFix = false;
|
||||||
|
|||||||
@@ -477,7 +477,7 @@ public class EntityValue extends Value
|
|||||||
return ListValue.of(new NumericValue(look.x),new NumericValue(look.y),new NumericValue(look.z));
|
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("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("silent", (e, a)-> new NumericValue(e.isSilent()));
|
||||||
put("gravity", (e, a) -> new NumericValue(!e.hasNoGravity()));
|
put("gravity", (e, a) -> new NumericValue(!e.hasNoGravity()));
|
||||||
put("immune_to_fire", (e, a) -> new NumericValue(e.isFireImmune()));
|
put("immune_to_fire", (e, a) -> new NumericValue(e.isFireImmune()));
|
||||||
|
|||||||
Reference in new issue
Block a user