From 6c1d3dd5f6aede0bf2bb4f42aa9a89aa8e3858e8 Mon Sep 17 00:00:00 2001 From: gnembon Date: Mon, 27 Jan 2020 14:48:56 -0400 Subject: [PATCH] fix defaults on hardcodeTNTangle --- src/main/java/carpet/CarpetSettings.java | 2 +- src/main/java/carpet/mixins/TntEntityMixin.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index cc06e4e1..43173f1c 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -131,7 +131,7 @@ public class CarpetSettings @Rule( desc = "Sets the horizontal random angle on TNT for debugging of TNT contraptions", category = TNT, options = "-1", strict = false, validate = TNTAngleValidator.class, extra = "Set to -1 for default behavior") - public static double hardcodeTNTangle; + public static double hardcodeTNTangle = -1.0D; private static class TNTAngleValidator extends Validator { @Override diff --git a/src/main/java/carpet/mixins/TntEntityMixin.java b/src/main/java/carpet/mixins/TntEntityMixin.java index 9ad47540..feed7ad2 100644 --- a/src/main/java/carpet/mixins/TntEntityMixin.java +++ b/src/main/java/carpet/mixins/TntEntityMixin.java @@ -36,7 +36,7 @@ public abstract class TntEntityMixin extends Entity implements TntEntityInterfac at = @At("RETURN")) private void modifyTNTAngle(World world, double x, double y, double z, LivingEntity entity, CallbackInfo ci) { - if (CarpetSettings.hardcodeTNTangle != -1) + if (CarpetSettings.hardcodeTNTangle != -1.0D) setVelocity(-Math.sin(CarpetSettings.hardcodeTNTangle) * 0.02, 0.2, -Math.cos(CarpetSettings.hardcodeTNTangle) * 0.02); }