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

Fix potential rance condition in connecting to vanilla servers as well. And move latch into client side only.

Browse source
This commit is contained in:
Lex Manos 2014-05-07 13:54:22 -07:00
parent 18aed8bf1b
commit 3cb3988491
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
View file

@ -834,9 +834,9 @@ public class FMLClientHandler implements IFMLSidedHandler
@Override @Override
public void fireNetRegistrationEvent(EventBus bus, NetworkManager manager, Set<String> channelSet, String channel, Side side) public void fireNetRegistrationEvent(EventBus bus, NetworkManager manager, Set<String> channelSet, String channel, Side side)
{ {
waitForPlayClient();
if (side == Side.CLIENT) if (side == Side.CLIENT)
{ {
waitForPlayClient();
bus.post(new FMLNetworkEvent.CustomPacketRegistrationEvent<NetHandlerPlayClient>(manager, channelSet, channel, side, NetHandlerPlayClient.class)); bus.post(new FMLNetworkEvent.CustomPacketRegistrationEvent<NetHandlerPlayClient>(manager, channelSet, channel, side, NetHandlerPlayClient.class));
} }
else else

2
fml/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java
View file

@ -29,6 +29,7 @@ import net.minecraft.network.play.server.S3FPacketCustomPayload;
import net.minecraft.network.play.server.S40PacketDisconnect; import net.minecraft.network.play.server.S40PacketDisconnect;
import net.minecraft.server.management.ServerConfigurationManager; import net.minecraft.server.management.ServerConfigurationManager;
import net.minecraft.util.ChatComponentText; import net.minecraft.util.ChatComponentText;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec;
@ -448,6 +449,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> imple
public void abortClientHandshake(String type) public void abortClientHandshake(String type)
{ {
FMLClientHandler.instance().waitForPlayClient();
completeClientSideConnection(ConnectionType.valueOf(type)); completeClientSideConnection(ConnectionType.valueOf(type));
} }