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

Remove code rendered unnecessary in the netty 4 upgrade.

Browse Source
This commit is contained in:
Major-
2014-01-26 21:59:38 +00:00
parent 97c23d5ed8
commit d3ab7919bb
3 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/apollo/net/codec/jaggrab/JagGrabRequestDecoder.java
+1 -2
View File
@@ -13,8 +13,7 @@ import java.util.List;
public final class JagGrabRequestDecoder extends MessageToMessageDecoder<String> { public final class JagGrabRequestDecoder extends MessageToMessageDecoder<String> {
@Override @Override
protected void decode(ChannelHandlerContext ctx, String msg, List<Object> out) { protected void decode(ChannelHandlerContext ctx, String request, List<Object> out) {
String request = (String) msg;
if (request.startsWith("JAGGRAB /")) { if (request.startsWith("JAGGRAB /")) {
String filePath = request.substring(8).trim(); String filePath = request.substring(8).trim();
out.add(new JagGrabRequest(filePath)); out.add(new JagGrabRequest(filePath));
src/org/apollo/net/codec/login/LoginDecoder.java
+5 -5
View File
@@ -89,11 +89,11 @@ public final class LoginDecoder extends StatefulFrameDecoder<LoginDecoderState>
usernameHash = buffer.readUnsignedByte(); usernameHash = buffer.readUnsignedByte();
serverSeed = random.nextLong(); serverSeed = random.nextLong();
ByteBuf resp = ctx.alloc().buffer(17); ByteBuf response = ctx.alloc().buffer(17);
resp.writeByte(LoginConstants.STATUS_EXCHANGE_DATA); response.writeByte(LoginConstants.STATUS_EXCHANGE_DATA);
resp.writeLong(0); response.writeLong(0);
resp.writeLong(serverSeed); response.writeLong(serverSeed);
ctx.channel().writeAndFlush(resp); ctx.channel().writeAndFlush(response);
setState(LoginDecoderState.LOGIN_HEADER); setState(LoginDecoderState.LOGIN_HEADER);
} }
src/org/apollo/net/codec/update/UpdateEncoder.java
+12 -16
View File
@@ -16,24 +16,20 @@ import org.apollo.fs.FileDescriptor;
public final class UpdateEncoder extends MessageToMessageEncoder<OnDemandResponse> { public final class UpdateEncoder extends MessageToMessageEncoder<OnDemandResponse> {
@Override @Override
protected void encode(ChannelHandlerContext ctx, OnDemandResponse msg, List<Object> out) { protected void encode(ChannelHandlerContext ctx, OnDemandResponse response, List<Object> out) {
if (msg instanceof OnDemandResponse) { FileDescriptor descriptor = response.getFileDescriptor();
OnDemandResponse response = (OnDemandResponse) msg; int fileSize = response.getFileSize();
int chunkId = response.getChunkId();
ByteBuf chunkData = response.getChunkData();
FileDescriptor descriptor = response.getFileDescriptor(); ByteBuf buffer = ctx.alloc().buffer(6 + chunkData.readableBytes());
int fileSize = response.getFileSize(); buffer.writeByte(descriptor.getType() - 1);
int chunkId = response.getChunkId(); buffer.writeShort(descriptor.getFile());
ByteBuf chunkData = response.getChunkData(); buffer.writeShort(fileSize);
buffer.writeByte(chunkId);
buffer.writeBytes(chunkData);
ByteBuf buffer = ctx.alloc().buffer(6 + chunkData.readableBytes()); out.add(buffer);
buffer.writeByte(descriptor.getType() - 1);
buffer.writeShort(descriptor.getFile());
buffer.writeShort(fileSize);
buffer.writeByte(chunkId);
buffer.writeBytes(chunkData);
out.add(buffer);
}
} }
} }