SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflicts from access transform update.

Browse Source
This commit is contained in:
md_5
2015-06-06 19:47:02 +10:00
parent 0f48b03bbc
commit 7e51dc4e18
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CraftBukkit-Patches/0055-BungeeCord-Support.patch
View File

@@ -108,9 +108,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
private final Queue<NetworkManager.QueuedPacket> i = Queues.newConcurrentLinkedQueue();
private final ReentrantReadWriteLock j = new ReentrantReadWriteLock();
public Channel channel; // CraftBukkit - public
public Channel channel;
- private SocketAddress l;
+ // Spigot Start
+ // Spigot Start // PAIL
+ public SocketAddress l;
+ public java.util.UUID spoofedUUID;
+ public com.mojang.authlib.properties.Property[] spoofedProfile;