From c9d2c99ccc8f100246047f8588dc016b466635b9 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 28 Feb 2019 19:09:59 +0200 Subject: [PATCH] Revert: Don't use NaN! Seriously, it's a bad idea. Crashes everyplace. --- .../java/com/minelittlepony/unicopia/player/IGravity.java | 2 +- .../unicopia/player/PlayerGravityDelegate.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/player/IGravity.java b/src/main/java/com/minelittlepony/unicopia/player/IGravity.java index 472f7c9a..947585c7 100644 --- a/src/main/java/com/minelittlepony/unicopia/player/IGravity.java +++ b/src/main/java/com/minelittlepony/unicopia/player/IGravity.java @@ -12,6 +12,6 @@ public interface IGravity { float getGravitationConstant(); default void clearGraviationConstant() { - setGraviationConstant(Float.NaN); + setGraviationConstant(0); } } diff --git a/src/main/java/com/minelittlepony/unicopia/player/PlayerGravityDelegate.java b/src/main/java/com/minelittlepony/unicopia/player/PlayerGravityDelegate.java index 8c9d74ba..bf23eb73 100644 --- a/src/main/java/com/minelittlepony/unicopia/player/PlayerGravityDelegate.java +++ b/src/main/java/com/minelittlepony/unicopia/player/PlayerGravityDelegate.java @@ -33,7 +33,7 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I public boolean isFlying = false; - private float gravity = Float.NaN; + private float gravity = 0; public PlayerGravityDelegate(IPlayer player) { this.player = player; @@ -122,7 +122,7 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I isFlying = entity.capabilities.isFlying && !entity.capabilities.isCreativeMode; if (!entity.capabilities.isFlying || !entity.capabilities.isCreativeMode) { - if (gravity != Float.NaN) { + if (gravity != 0) { entity.motionY += 0.08; entity.motionY -= gravity; @@ -306,7 +306,7 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I compound.setFloat("flightExperience", flightExperience); compound.setBoolean("isFlying", isFlying); - if (gravity != Float.NaN) { + if (gravity != 0) { compound.setFloat("gravity", gravity); } } @@ -320,7 +320,7 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I if (compound.hasKey("gravity")) { gravity = compound.getFloat("gravity"); } else { - gravity = Float.NaN; + gravity = 0; } }