upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 16:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/fml/common/network/internal/EntitySpawnHandler.java
-20
View File
@@ -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)
src/main/java/net/minecraftforge/fml/common/network/internal/FMLMessage.java
-32
View File
@@ -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;
src/main/java/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java
-8
View File
@@ -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);
src/main/java/net/minecraftforge/fml/common/network/internal/FMLRuntimeCodec.java
-1
View File
@@ -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