2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-04 00:38:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary workaround method leftover from netty 3.

Browse Source
This commit is contained in:
Major-
2014-02-16 17:12:17 +00:00
parent 05d04c9fb2
commit 5f9974b04c
1 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/apollo/net/codec/game/GamePacketDecoder.java
+2 -23
View File
@@ -1,7 +1,6 @@
package org.apollo.net.codec.game;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
import java.io.IOException;
@@ -88,9 +87,7 @@ public final class GamePacketDecoder extends StatefulFrameDecoder<GameDecoderSta
private Object decodeLength(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> out) {
if (buffer.isReadable()) {
length = buffer.readUnsignedByte();
if (length == 0) {
decodeZeroLengthPacket(ctx, buffer, out);
} else {
if (length != 0) {
setState(GameDecoderState.GAME_PAYLOAD);
}
}
@@ -120,9 +117,7 @@ public final class GamePacketDecoder extends StatefulFrameDecoder<GameDecoderSta
switch (type) {
case FIXED:
length = metaData.getLength();
if (length == 0) {
decodeZeroLengthPacket(ctx, buffer, out);
} else {
if (length != 0) {
setState(GameDecoderState.GAME_PAYLOAD);
}
break;
@@ -152,20 +147,4 @@ public final class GamePacketDecoder extends StatefulFrameDecoder<GameDecoderSta
}
}
/**
* Decodes a zero length packet. This hackery is required as Netty will throw an exception if we return a frame but
* have read nothing!
*
* @param ctx The channel handler context.
* @param channel The channel.
* @param buffer The buffer.
* @return The frame, or {@code null}.
* @throws Exception If an error occurs.
*/
private void decodeZeroLengthPacket(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> out) {
ByteBuf payload = Unpooled.EMPTY_BUFFER;
setState(GameDecoderState.GAME_OPCODE);
out.add(new GamePacket(opcode, type, payload));
}
}