Moved cache and packet queues from D2GSPacketProcessor to Server

This commit is contained in:
Collin Smith
2020-06-29 19:25:01 -07:00
parent 0333bdd40a
commit a205135c9e
3 changed files with 8 additions and 9 deletions

View File

@ -4,10 +4,6 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
import io.netty.channel.ChannelHandlerContext;
import java.net.SocketAddress;
import java.util.ArrayList;
import java.util.Collection;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import com.badlogic.gdx.Gdx;
@ -18,10 +14,6 @@ import com.riiablo.nnet.PacketProcessor;
public class D2GSPacketProcessor implements PacketProcessor {
private static final String TAG = "D2GSPacketProcessor";
final BlockingQueue<D2GSPacket<Netty>> packets = new ArrayBlockingQueue<>(32);
final Collection<D2GSPacket<Netty>> cache = new ArrayList<>(1024);
final BlockingQueue<D2GSPacket<Netty>> outPackets = new ArrayBlockingQueue<>(1024);
@Override
public void processPacket(ChannelHandlerContext ctx, SocketAddress from, ByteBuf bb) {
Gdx.app.debug(TAG, "Processing packet from " + from + "...");

View File

@ -226,7 +226,7 @@ public class Main extends ApplicationAdapter {
.register("map", map)
.register("factory", factory)
.register("player", server.player)
.register("outPackets", packetProcessor.outPackets)
.register("outPackets", server.outPackets)
;
Riiablo.engine = world = new World(config);

View File

@ -19,7 +19,11 @@ import io.netty.channel.socket.nio.NioServerSocketChannel;
import io.netty.handler.codec.ByteToMessageDecoder;
import java.net.InetAddress;
import java.net.SocketAddress;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.Validate;
@ -78,6 +82,9 @@ public class Server implements PacketProcessor {
};
}
final BlockingQueue<D2GSPacket<D2GS>> packets = new ArrayBlockingQueue<>(32);
final Collection<D2GSPacket<D2GS>> cache = new ArrayList<>(1024);
final BlockingQueue<D2GSPacket<D2GS>> outPackets = new ArrayBlockingQueue<>(1024);
final IntIntMap player = new IntIntMap();
public Server(InetAddress address, int port, D2GSPacketProcessor packetProcessor) {