keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Compleetly skip FML handshake for Vanilla connections. Should fix race condition. Closes #3084

Browse source
This commit is contained in:
LexManos 2016-08-08 17:35:15 -07:00
parent 69af6a9b8c
commit 62ec59103a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java
View file

@ -147,12 +147,12 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet<?>> im
public void serverToClientHandshake(EntityPlayerMP player) public void serverToClientHandshake(EntityPlayerMP player)
{ {
this.player = player; this.player = player;
insertIntoChannel();
Boolean fml = this.manager.channel().attr(NetworkRegistry.FML_MARKER).get(); Boolean fml = this.manager.channel().attr(NetworkRegistry.FML_MARKER).get();
if (fml != null && fml) if (fml != null && fml)
{ {
//FML on client, send server hello //FML on client, send server hello
//TODO: Make this cleaner as it uses netty magic 0.o //TODO: Make this cleaner as it uses netty magic 0.o
insertIntoChannel();
} }
else else
{ {