From 17564633c3d9699128a2a9177904ac1f31b3da64 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 11 Oct 2016 17:57:50 +0100 Subject: [PATCH] Fixed Luminizers. Closes #1920 --- .../botania/common/block/tile/TileLightRelay.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index e35c06452..751b886b8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -22,6 +22,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityEnderPearl; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; @@ -55,7 +56,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { public void mountEntity(Entity e) { BlockPos nextDest = getNextDestination(); - if(e.isRiding() || worldObj.isRemote || nextDest != null || !isValidBinding()) + if(e.isRiding() || worldObj.isRemote || nextDest == null || !isValidBinding()) return; EntityPlayerMover mover = new EntityPlayerMover(worldObj, pos, nextDest); @@ -283,7 +284,12 @@ public class TileLightRelay extends TileMod implements IWandBindable { } } - posY += 1.5; + for(Entity e : getPassengers()) { + e.dismountRidingEntity(); + if(e instanceof EntityPlayerMP) + ((EntityPlayerMP) e).connection.setPlayerLocation(posX, posY, posZ, e.rotationYaw, e.rotationPitch); + else e.setPosition(posX, posY, posZ); + } setDead(); } else { Vector3 thisVec = Vector3.fromEntity(this);