Remove our entity position fixer. Vanilla fixed the bug in 1.9.

This commit is contained in:
LexManos committed 2016-03-16 18:24:11 -07:00
1 parent 6b926f9a06
commit f22ed86ad9
5 files changed
+3 -79

No files matched your search

@@ -1,21 +1,6 @@
--- ../src-base/minecraft/net/minecraft/entity/EntityTrackerEntry.java
+++ ../src-work/minecraft/net/minecraft/entity/EntityTrackerEntry.java
@@ -398,6 +398,14 @@
this.field_73138_k = this.field_73132_a.field_70181_x;
this.field_73135_l = this.field_73132_a.field_70179_y;
+ int posX = MathHelper.func_76128_c(this.field_73132_a.field_70165_t * 32.0D);
+ int posY = MathHelper.func_76128_c(this.field_73132_a.field_70163_u * 32.0D);
+ int posZ = MathHelper.func_76128_c(this.field_73132_a.field_70161_v * 32.0D);
+ if (posX != this.field_73128_d || posY != this.field_73129_e || posZ != this.field_73126_f)
+ {
+ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.makeEntitySpawnAdjustment(this.field_73132_a, p_73117_1_, this.field_73128_d, this.field_73129_e, this.field_73126_f);
+ }
+
if (flag && !(packet instanceof SPacketSpawnMob))
{
p_73117_1_.field_71135_a.func_147359_a(new SPacketEntityVelocity(this.field_73132_a.func_145782_y(), this.field_73132_a.field_70159_w, this.field_73132_a.field_70181_x, this.field_73132_a.field_70179_y));
@@ -438,6 +446,7 @@
@@ -438,6 +438,7 @@
this.field_73132_a.func_184178_b(p_73117_1_);
p_73117_1_.func_184848_d(this.field_73132_a);
@@ -23,7 +8,7 @@
}
}
else if (this.field_73134_o.contains(p_73117_1_))
@@ -445,6 +454,7 @@
@@ -445,6 +446,7 @@
this.field_73134_o.remove(p_73117_1_);
this.field_73132_a.func_184203_c(p_73117_1_);
p_73117_1_.func_152339_d(this.field_73132_a);
@@ -31,7 +16,7 @@
}
}
}
@@ -477,6 +487,9 @@
@@ -477,6 +479,9 @@
field_151262_p.warn("Fetching addPacket for removed entity");
}
@@ -17,7 +17,6 @@ import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.ModContainer;
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.network.internal.FMLMessage.EntityAdjustMessage;
import net.minecraftforge.fml.common.network.internal.FMLMessage.EntityMessage;
import net.minecraftforge.fml.common.registry.EntityRegistry;
import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData;
@@ -53,25 +52,6 @@ public class EntitySpawnHandler extends SimpleChannelInboundHandler<FMLMessage.E
{
spawnEntity((FMLMessage.EntitySpawnMessage)msg);
}
else if (msg.getClass().equals(FMLMessage.EntityAdjustMessage.class))
{
adjustEntity((FMLMessage.EntityAdjustMessage)msg);
}
}
private void adjustEntity(EntityAdjustMessage msg)
{
Entity ent = FMLClientHandler.instance().getWorldClient().getEntityByID(msg.entityId);
if (ent != null)
{
ent.serverPosX = msg.serverX;
ent.serverPosY = msg.serverY;
ent.serverPosZ = msg.serverZ;
}
else
{
FMLLog.fine("Attempted to adjust the position of entity %d which is not present on the client", msg.entityId);
}
}
private void spawnEntity(FMLMessage.EntitySpawnMessage spawnMsg)
@@ -109,38 +109,6 @@ public abstract class FMLMessage {
}
}
public static class EntityAdjustMessage extends EntityMessage {
long serverX;
long serverY;
long serverZ;
public EntityAdjustMessage() {}
public EntityAdjustMessage(Entity entity, long serverX, long serverY, long serverZ)
{
super(entity);
this.serverX = serverX;
this.serverY = serverY;
this.serverZ = serverZ;
}
@Override
void toBytes(ByteBuf buf)
{
super.toBytes(buf);
buf.writeLong(serverX);
buf.writeLong(serverY);
buf.writeLong(serverZ);
}
@Override
void fromBytes(ByteBuf buf)
{
super.fromBytes(buf);
serverX = buf.readInt();
serverY = buf.readInt();
serverZ = buf.readInt();
}
}
public static class EntitySpawnMessage extends EntityMessage {
String modId;
int modEntityTypeId;
@@ -109,14 +109,6 @@ public class FMLNetworkHandler
}
public static void makeEntitySpawnAdjustment(Entity entity, EntityPlayerMP player, long serverX, long serverY, long serverZ)
{
EmbeddedChannel embeddedChannel = channelPair.get(Side.SERVER);
embeddedChannel.attr(FMLOutboundHandler.FML_MESSAGETARGET).set(OutboundTarget.PLAYER);
embeddedChannel.attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player);
embeddedChannel.writeOutbound(new FMLMessage.EntityAdjustMessage(entity, serverX, serverY, serverZ));
}
public static Packet<?> getEntitySpawningPacket(Entity entity)
{
EntityRegistration er = EntityRegistry.instance().lookupModSpawn(entity.getClass(), false);
@@ -16,7 +16,6 @@ public class FMLRuntimeCodec extends FMLIndexedMessageToMessageCodec<FMLMessage>
addDiscriminator(0,FMLMessage.CompleteHandshake.class);
addDiscriminator(1,FMLMessage.OpenGui.class);
addDiscriminator(2,FMLMessage.EntitySpawnMessage.class);
addDiscriminator(3,FMLMessage.EntityAdjustMessage.class);
}
@Override
public void encodeInto(ChannelHandlerContext ctx, FMLMessage msg, ByteBuf target) throws Exception