Cleanup w/ confirm upstream for direct-import classes
This commit is contained in:
@@ -9,6 +9,6 @@ import net.minecraft.server.PlayerConnection;
|
|||||||
public class MixinPlayerConnection {
|
public class MixinPlayerConnection {
|
||||||
@Overwrite
|
@Overwrite
|
||||||
private long d() {
|
private long d() {
|
||||||
return System.currentTimeMillis();
|
return System.currentTimeMillis(); // nanoTime() / 1000000L
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import io.netty.handler.timeout.TimeoutException;
|
|||||||
import io.netty.util.AttributeKey;
|
import io.netty.util.AttributeKey;
|
||||||
import io.netty.util.concurrent.Future;
|
import io.netty.util.concurrent.Future;
|
||||||
import io.netty.util.concurrent.GenericFutureListener;
|
import io.netty.util.concurrent.GenericFutureListener;
|
||||||
|
|
||||||
import java.net.SocketAddress;
|
import java.net.SocketAddress;
|
||||||
import java.util.Queue;
|
import java.util.Queue;
|
||||||
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||||
@@ -34,7 +35,6 @@ import org.apache.logging.log4j.MarkerManager;
|
|||||||
* <br>
|
* <br>
|
||||||
* 1) Add volatile to fields<br>
|
* 1) Add volatile to fields<br>
|
||||||
* 2) Expose private members<br>
|
* 2) Expose private members<br>
|
||||||
* 3) Change writeLock back to readLock (Paper Anti-XRay modification) by integrating checks
|
|
||||||
* @author cakoyo
|
* @author cakoyo
|
||||||
*/
|
*/
|
||||||
public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|||||||
private int receivedMovePackets;
|
private int receivedMovePackets;
|
||||||
private int processedMovePackets;
|
private int processedMovePackets;
|
||||||
private AutoRecipe H = new AutoRecipe();
|
private AutoRecipe H = new AutoRecipe();
|
||||||
private static final long KEEPALIVE_LIMIT = /*Long.getLong("paper.playerconnection.keepalive", 30)*/ AkarinGlobalConfig.keepAliveTimeout * 1000; // Paper - provide property to set keepalive limit // Akarin - more accessible - keep for compatibility
|
private static final long KEEPALIVE_LIMIT = /*Long.getLong("paper.playerconnection.keepalive", 30)*/ AkarinGlobalConfig.keepAliveTimeout * 1000; // Paper - provide property to set keepalive limit // Akarin - more accessible - keep changes
|
||||||
|
|
||||||
public PlayerConnection(MinecraftServer minecraftserver, NetworkManager networkmanager, EntityPlayer entityplayer) {
|
public PlayerConnection(MinecraftServer minecraftserver, NetworkManager networkmanager, EntityPlayer entityplayer) {
|
||||||
this.minecraftServer = minecraftserver;
|
this.minecraftServer = minecraftserver;
|
||||||
@@ -1154,7 +1154,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|||||||
// CraftBukkit start - Rarely it would send a disconnect line twice
|
// CraftBukkit start - Rarely it would send a disconnect line twice
|
||||||
if (this.processedDisconnect) {
|
if (this.processedDisconnect) {
|
||||||
return;
|
return;
|
||||||
}else {
|
} else {
|
||||||
this.processedDisconnect = true;
|
this.processedDisconnect = true;
|
||||||
}
|
}
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package net.minecraft.server;
|
|||||||
import com.google.common.collect.Lists;
|
import com.google.common.collect.Lists;
|
||||||
import com.google.common.collect.Maps;
|
import com.google.common.collect.Maps;
|
||||||
import com.google.common.util.concurrent.ListenableFuture;
|
import com.google.common.util.concurrent.ListenableFuture;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@@ -30,10 +29,11 @@ import org.bukkit.event.weather.LightningStrikeEvent;
|
|||||||
/**
|
/**
|
||||||
* <b>Akarin Changes Note</b><br>
|
* <b>Akarin Changes Note</b><br>
|
||||||
* <br>
|
* <br>
|
||||||
* 1) Add tick lock for per world<br>
|
* 1) Add lock object for per world<br>
|
||||||
* @author cakoyo
|
* @author cakoyo
|
||||||
*/
|
*/
|
||||||
public class WorldServer extends World implements IAsyncTaskHandler {
|
public class WorldServer extends World implements IAsyncTaskHandler {
|
||||||
|
public final Object tickLock = new Object(); // Akarin - in case concurrently tick one world
|
||||||
|
|
||||||
private static final Logger a = LogManager.getLogger();
|
private static final Logger a = LogManager.getLogger();
|
||||||
boolean stopPhysicsEvent = false; // Paper
|
boolean stopPhysicsEvent = false; // Paper
|
||||||
@@ -52,8 +52,6 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
|||||||
private final WorldServer.BlockActionDataList[] U = new WorldServer.BlockActionDataList[] { new WorldServer.BlockActionDataList(null), new WorldServer.BlockActionDataList(null)};
|
private final WorldServer.BlockActionDataList[] U = new WorldServer.BlockActionDataList[] { new WorldServer.BlockActionDataList(null), new WorldServer.BlockActionDataList(null)};
|
||||||
private int V;
|
private int V;
|
||||||
private final List<NextTickListEntry> W = Lists.newArrayList();
|
private final List<NextTickListEntry> W = Lists.newArrayList();
|
||||||
|
|
||||||
public final Object tickLock = new Object(); // Akarin - in case concurrently tick one world
|
|
||||||
|
|
||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
public final int dimension;
|
public final int dimension;
|
||||||
|
|||||||
Reference in New Issue
Block a user