From 7c0b26880cda4430944c515c4eb7ae7260bad0d4 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Tue, 17 Dec 2013 20:58:30 -0500 Subject: [PATCH] Fixed jetpack kicking players --- .../mekanism/common/CommonPlayerTickHandler.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/common/mekanism/common/CommonPlayerTickHandler.java b/common/mekanism/common/CommonPlayerTickHandler.java index 9e372b4cf..c2a50c6dd 100644 --- a/common/mekanism/common/CommonPlayerTickHandler.java +++ b/common/mekanism/common/CommonPlayerTickHandler.java @@ -2,17 +2,16 @@ package mekanism.common; import java.util.EnumSet; -import org.lwjgl.input.Keyboard; - import mekanism.common.PacketHandler.Transmission; import mekanism.common.item.ItemGasMask; import mekanism.common.item.ItemJetpack; +import mekanism.common.item.ItemJetpack.JetpackMode; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemScubaTank; -import mekanism.common.item.ItemJetpack.JetpackMode; import mekanism.common.network.PacketStatusUpdate; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.ITickHandler; import cpw.mods.fml.common.TickType; @@ -94,7 +93,6 @@ public class CommonPlayerTickHandler implements ITickHandler if(jetpack.getMode(player.getCurrentItemOrArmor(3)) == JetpackMode.NORMAL) { player.motionY = Math.min(player.motionY + 0.15D, 0.5D); - player.fallDistance = 0.0F; } else if(jetpack.getMode(player.getCurrentItemOrArmor(3)) == JetpackMode.HOVER) { @@ -119,8 +117,13 @@ public class CommonPlayerTickHandler implements ITickHandler player.motionY = Math.max(player.motionY - 0.15D, -0.2D); } } - - player.fallDistance = 0.0F; + } + + player.fallDistance = 0.0F; + + if(player instanceof EntityPlayerMP) + { + ((EntityPlayerMP)player).playerNetServerHandler.ticksForFloatKick = 0; } jetpack.useGas(player.getCurrentItemOrArmor(3));