Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2020-01-27 14:50:11 -04:00
commit e94dd23402
6 files changed
+147 -82

No files matched your search

@@ -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);
}