diff --git a/src/org/apollo/net/codec/jaggrab/JagGrabRequestDecoder.java b/src/org/apollo/net/codec/jaggrab/JagGrabRequestDecoder.java index 579058d6..53ce3235 100644 --- a/src/org/apollo/net/codec/jaggrab/JagGrabRequestDecoder.java +++ b/src/org/apollo/net/codec/jaggrab/JagGrabRequestDecoder.java @@ -13,8 +13,7 @@ import java.util.List; public final class JagGrabRequestDecoder extends MessageToMessageDecoder { @Override - protected void decode(ChannelHandlerContext ctx, String msg, List out) { - String request = (String) msg; + protected void decode(ChannelHandlerContext ctx, String request, List out) { if (request.startsWith("JAGGRAB /")) { String filePath = request.substring(8).trim(); out.add(new JagGrabRequest(filePath)); diff --git a/src/org/apollo/net/codec/login/LoginDecoder.java b/src/org/apollo/net/codec/login/LoginDecoder.java index 1a0ca1db..9049be2c 100644 --- a/src/org/apollo/net/codec/login/LoginDecoder.java +++ b/src/org/apollo/net/codec/login/LoginDecoder.java @@ -89,11 +89,11 @@ public final class LoginDecoder extends StatefulFrameDecoder usernameHash = buffer.readUnsignedByte(); serverSeed = random.nextLong(); - ByteBuf resp = ctx.alloc().buffer(17); - resp.writeByte(LoginConstants.STATUS_EXCHANGE_DATA); - resp.writeLong(0); - resp.writeLong(serverSeed); - ctx.channel().writeAndFlush(resp); + ByteBuf response = ctx.alloc().buffer(17); + response.writeByte(LoginConstants.STATUS_EXCHANGE_DATA); + response.writeLong(0); + response.writeLong(serverSeed); + ctx.channel().writeAndFlush(response); setState(LoginDecoderState.LOGIN_HEADER); } diff --git a/src/org/apollo/net/codec/update/UpdateEncoder.java b/src/org/apollo/net/codec/update/UpdateEncoder.java index 7074770a..638844fc 100644 --- a/src/org/apollo/net/codec/update/UpdateEncoder.java +++ b/src/org/apollo/net/codec/update/UpdateEncoder.java @@ -16,24 +16,20 @@ import org.apollo.fs.FileDescriptor; public final class UpdateEncoder extends MessageToMessageEncoder { @Override - protected void encode(ChannelHandlerContext ctx, OnDemandResponse msg, List out) { - if (msg instanceof OnDemandResponse) { - OnDemandResponse response = (OnDemandResponse) msg; + protected void encode(ChannelHandlerContext ctx, OnDemandResponse response, List out) { + FileDescriptor descriptor = response.getFileDescriptor(); + int fileSize = response.getFileSize(); + int chunkId = response.getChunkId(); + ByteBuf chunkData = response.getChunkData(); - FileDescriptor descriptor = response.getFileDescriptor(); - int fileSize = response.getFileSize(); - int chunkId = response.getChunkId(); - ByteBuf chunkData = response.getChunkData(); + ByteBuf buffer = ctx.alloc().buffer(6 + chunkData.readableBytes()); + buffer.writeByte(descriptor.getType() - 1); + buffer.writeShort(descriptor.getFile()); + buffer.writeShort(fileSize); + buffer.writeByte(chunkId); + buffer.writeBytes(chunkData); - ByteBuf buffer = ctx.alloc().buffer(6 + chunkData.readableBytes()); - buffer.writeByte(descriptor.getType() - 1); - buffer.writeShort(descriptor.getFile()); - buffer.writeShort(fileSize); - buffer.writeByte(chunkId); - buffer.writeBytes(chunkData); - - out.add(buffer); - } + out.add(buffer); } } \ No newline at end of file