Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixes build (Removes inner anonymous class)

Browse Source
This commit is contained in:
Sotr
2018-06-09 16:31:22 +08:00
parent ba0e5b139b
commit 82308b35a2
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sources/src/main/java/io/akarin/server/mixin/nsc/OptimisticNetworkManager.java
View File

@@ -8,8 +8,6 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import com.google.common.base.Predicate;
import io.akarin.api.CheckedConcurrentLinkedQueue; import io.akarin.api.CheckedConcurrentLinkedQueue;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import io.netty.util.concurrent.Future; import io.netty.util.concurrent.Future;
@@ -28,14 +26,6 @@ public class OptimisticNetworkManager {
@Shadow private Queue<NetworkManager.QueuedPacket> getPacketQueue() { return null; } @Shadow private Queue<NetworkManager.QueuedPacket> getPacketQueue() { return null; }
@Shadow private void dispatchPacket(Packet<?> packet, GenericFutureListener<? extends Future<? super Void>>[] genericFutureListeners) {} @Shadow private void dispatchPacket(Packet<?> packet, GenericFutureListener<? extends Future<? super Void>>[] genericFutureListeners) {}
private static final Predicate<QueuedPacket> IS_CHUNK_NOT_READY = new Predicate<QueuedPacket>() {
@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); private static final QueuedPacket SIGNAL_PACKET = new QueuedPacket(null, null);
@Overwrite @Overwrite
@@ -48,7 +38,9 @@ public class OptimisticNetworkManager {
this.j.readLock().lock(); this.j.readLock().lock();
try { try {
while (!this.i.isEmpty()) { while (!this.i.isEmpty()) {
NetworkManager.QueuedPacket packet = ((CheckedConcurrentLinkedQueue<QueuedPacket>) getPacketQueue()).poll(IS_CHUNK_NOT_READY, SIGNAL_PACKET); NetworkManager.QueuedPacket packet = ((CheckedConcurrentLinkedQueue<QueuedPacket>) 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 != null) { // Fix NPE (Spigot bug caused by handleDisconnection())
if (packet == SIGNAL_PACKET) { if (packet == SIGNAL_PACKET) {