From 30d0534377e34e0ab32294990c1fe2a2d018bf1d Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Thu, 13 Oct 2016 17:55:15 +0200 Subject: [PATCH] duct tape solution. Tested if i jump with no Armor i died. Featherwings 2,5 Hearts left = 25% damage reduction Thaumium Wings 5 Hearts left = 50% damage reduction Nano Wings 7,5 Hearts left = 75% damage reduction Quantum Wings 10 Hearts left = 100% damage reduction --- src/main/java/emt/item/armor/wings/ItemFeatherWing.java | 3 +++ src/main/java/emt/item/armor/wings/ItemNanoWing.java | 2 +- .../java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java index daac57c..1b8c2e9 100644 --- a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java +++ b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java @@ -115,5 +115,8 @@ public class ItemFeatherWing extends ItemArmor { if (player.isSneaking() && !player.onGround && player.motionY < 0) { player.motionY *= 0.6; } + if (player.fallDistance > 0.0F) { + player.fallDistance-= player.fallDistance/40; + } } } diff --git a/src/main/java/emt/item/armor/wings/ItemNanoWing.java b/src/main/java/emt/item/armor/wings/ItemNanoWing.java index 03ec4d2..c304b0c 100644 --- a/src/main/java/emt/item/armor/wings/ItemNanoWing.java +++ b/src/main/java/emt/item/armor/wings/ItemNanoWing.java @@ -67,7 +67,7 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { this.useWings(player, stack, world, 0.25f, 0.6f, 0.3f, 5); if (player.fallDistance > 0.0F) { - player.fallDistance = 0; + player.fallDistance-= player.fallDistance/8; } } diff --git a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java index 56edd87..8eff362 100644 --- a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java +++ b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java @@ -57,5 +57,8 @@ public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisD @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { this.useWings(player, stack, world, 0.15f, 0.7f, 0.5f, 0); + if (player.fallDistance > 0.0F) { + player.fallDistance -= player.fallDistance /25; + } } }