Upstream merge
This commit is contained in:
@@ -81,7 +81,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
@@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
|
@@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
|
||||||
private final Queue<NetworkManager.QueuedPacket> i = Queues.newConcurrentLinkedQueue();
|
private final Queue<NetworkManager.QueuedPacket> i = Queues.newConcurrentLinkedQueue();
|
||||||
private final ReentrantReadWriteLock j = new ReentrantReadWriteLock();
|
private final ReentrantReadWriteLock j = new ReentrantReadWriteLock();
|
||||||
public Channel k; // CraftBukkit - public, PAIL: rename
|
public Channel k; // CraftBukkit - public, PAIL: Rename channel
|
||||||
- private SocketAddress l;
|
- private SocketAddress l;
|
||||||
+ // Spigot Start
|
+ // Spigot Start
|
||||||
+ public SocketAddress l;
|
+ public SocketAddress l;
|
||||||
|
|||||||
Reference in New Issue
Block a user