From 82308b35a2525a39073527dfd5280617e2e0d587 Mon Sep 17 00:00:00 2001 From: Sotr Date: Sat, 9 Jun 2018 16:31:22 +0800 Subject: [PATCH] Fixes build (Removes inner anonymous class) --- .../server/mixin/nsc/OptimisticNetworkManager.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/sources/src/main/java/io/akarin/server/mixin/nsc/OptimisticNetworkManager.java b/sources/src/main/java/io/akarin/server/mixin/nsc/OptimisticNetworkManager.java index c0f35c660..287bf2531 100644 --- a/sources/src/main/java/io/akarin/server/mixin/nsc/OptimisticNetworkManager.java +++ b/sources/src/main/java/io/akarin/server/mixin/nsc/OptimisticNetworkManager.java @@ -8,8 +8,6 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; -import com.google.common.base.Predicate; - import io.akarin.api.CheckedConcurrentLinkedQueue; import io.netty.channel.Channel; import io.netty.util.concurrent.Future; @@ -28,14 +26,6 @@ public class OptimisticNetworkManager { @Shadow private Queue getPacketQueue() { return null; } @Shadow private void dispatchPacket(Packet packet, GenericFutureListener>[] genericFutureListeners) {} - private static final Predicate IS_CHUNK_NOT_READY = new Predicate() { - @Override - public boolean apply(QueuedPacket item) { - Packet packet = item.getPacket(); - return packet instanceof PacketPlayOutMapChunk && !((PacketPlayOutMapChunk) packet).isReady(); // Check if the peeked packet is a chunk packet which is not ready - } - }; - private static final QueuedPacket SIGNAL_PACKET = new QueuedPacket(null, null); @Overwrite @@ -48,7 +38,9 @@ public class OptimisticNetworkManager { this.j.readLock().lock(); try { while (!this.i.isEmpty()) { - NetworkManager.QueuedPacket packet = ((CheckedConcurrentLinkedQueue) getPacketQueue()).poll(IS_CHUNK_NOT_READY, SIGNAL_PACKET); + NetworkManager.QueuedPacket packet = ((CheckedConcurrentLinkedQueue) getPacketQueue()).poll(item -> { + return item.getPacket() instanceof PacketPlayOutMapChunk && !((PacketPlayOutMapChunk) item.getPacket()).isReady(); + }, SIGNAL_PACKET); if (packet != null) { // Fix NPE (Spigot bug caused by handleDisconnection()) if (packet == SIGNAL_PACKET) {