From 531368e4ee29914f0dc6e67da25a0a1df25db380 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 22 Aug 2018 14:49:29 +0200 Subject: [PATCH] Fixed rainboom parameter not checking if you're flying O.o --- src/main/java/com/minelittlepony/model/AbstractPonyModel.java | 2 +- .../java/com/minelittlepony/render/LevitatingItemRenderer.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java index 6bf06120..365b4c6d 100644 --- a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java @@ -72,7 +72,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel, P * Checks flying and speed conditions and sets rainboom to true if we're a species with wings and is going faaast. */ protected void checkRainboom(Entity entity, float swing) { - rainboom = canFly() || isElytraFlying(); + rainboom = (isFlying() && canFly()) || isElytraFlying(); rainboom &= Math.sqrt(entity.motionX * entity.motionX + entity.motionZ * entity.motionZ) > 0.4F; } diff --git a/src/main/java/com/minelittlepony/render/LevitatingItemRenderer.java b/src/main/java/com/minelittlepony/render/LevitatingItemRenderer.java index 849fbbfc..5cd76efd 100644 --- a/src/main/java/com/minelittlepony/render/LevitatingItemRenderer.java +++ b/src/main/java/com/minelittlepony/render/LevitatingItemRenderer.java @@ -1,6 +1,5 @@ package com.minelittlepony.render; -import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL14; import com.minelittlepony.MineLittlePony; @@ -13,7 +12,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.GlStateManager.DestFactor; import net.minecraft.client.renderer.GlStateManager.SourceFactor;