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

Merge branch 'bungeecord' of github.com:bloodmc/FML

This commit is contained in:
cpw 2014-08-29 21:37:48 -04:00
parent 70c115588c 08ac6d548f
commit 67ebda9ace
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeClientState.java
View File

@ -125,6 +125,11 @@ enum FMLHandshakeClientState implements IHandshakeState<FMLHandshakeClientState>
@Override @Override
public FMLHandshakeClientState accept(ChannelHandlerContext ctx, FMLHandshakeMessage msg) public FMLHandshakeClientState accept(ChannelHandlerContext ctx, FMLHandshakeMessage msg)
{ {
if (msg instanceof FMLHandshakeMessage.HandshakeReset)
{
GameData.revertToFrozen();
return HELLO;
}
return this; return this;
} }
}, },

1
fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeCodec.java
View File

@ -12,6 +12,7 @@ public class FMLHandshakeCodec extends FMLIndexedMessageToMessageCodec<FMLHandsh
addDiscriminator((byte)2, FMLHandshakeMessage.ModList.class); addDiscriminator((byte)2, FMLHandshakeMessage.ModList.class);
addDiscriminator((byte)3, FMLHandshakeMessage.ModIdData.class); addDiscriminator((byte)3, FMLHandshakeMessage.ModIdData.class);
addDiscriminator((byte)-1, FMLHandshakeMessage.HandshakeAck.class); addDiscriminator((byte)-1, FMLHandshakeMessage.HandshakeAck.class);
addDiscriminator((byte)-2, FMLHandshakeMessage.HandshakeReset.class);
} }
@Override @Override
public void encodeInto(ChannelHandlerContext ctx, FMLHandshakeMessage msg, ByteBuf target) throws Exception public void encodeInto(ChannelHandlerContext ctx, FMLHandshakeMessage msg, ByteBuf target) throws Exception

3
fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java
View File

@ -235,6 +235,9 @@ public abstract class FMLHandshakeMessage {
return super.toString(side) + ":{"+phase+"}"; return super.toString(side) + ":{"+phase+"}";
} }
} }
public static class HandshakeReset extends FMLHandshakeMessage {
public HandshakeReset() {}
}
public void fromBytes(ByteBuf buffer) public void fromBytes(ByteBuf buffer)
{ {
} }