tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed a few balloon issues

Browse source
This commit is contained in:
aidancbrady 2015-07-20 14:26:55 -07:00
parent c7fe1f86eb
commit 9a9f77af87
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/mekanism/common/entity/EntityBalloon.java
View file

@ -1,9 +1,9 @@
package mekanism.common.entity;
import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import io.netty.buffer.ByteBuf;
import java.util.UUID;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.Pos3D;
@ -17,9 +17,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.UUID;
public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
{
@ -218,7 +217,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
public double getAddedHeight()
{
return latchedEntity.height + (latchedEntity instanceof EntityPlayer ? 0F : 1.7F);
return latchedEntity.height + (latchedEntity instanceof EntityPlayer ? 0.25F : 1.7F);
}
private int getFloor(EntityLivingBase entity)
@ -231,7 +230,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
{
if(i < 256 && !worldObj.isAirBlock(xPos, i, zPos))
{
return i+1;
return i+1+(entity instanceof EntityPlayer ? 1 : 0);
}
}

4
src/main/java/mekanism/common/multipart/PartTransmitter.java
View file

@ -1,7 +1,5 @@
package mekanism.common.multipart;
import mekanism.api.Chunk3D;
import mekanism.api.Coord4D;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.DynamicNetwork.NetworkClientRequest;
import mekanism.api.transmitters.ITransmitterTile;
@ -33,7 +31,6 @@ public abstract class PartTransmitter<A, N extends DynamicNetwork<A, N>> extends
if(!world().isRemote)
{
System.out.println("Reload " + new Chunk3D(Coord4D.get(tile())));
TransmitterNetworkRegistry.registerOrphanTransmitter(getTransmitter());
}
else {
@ -52,7 +49,6 @@ public abstract class PartTransmitter<A, N extends DynamicNetwork<A, N>> extends
if(!world().isRemote)
{
System.out.println("Unload " + new Chunk3D(Coord4D.get(tile())));
getTransmitter().takeShare();
TransmitterNetworkRegistry.invalidateTransmitter(getTransmitter());
}