From 9fa5ccba94dfb044eb0dc2a9eb615b34d2f58966 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 19 Mar 2015 21:31:59 +0000 Subject: [PATCH] Upstream merge --- CraftBukkit-Patches/0056-BungeeCord-Support.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CraftBukkit-Patches/0056-BungeeCord-Support.patch b/CraftBukkit-Patches/0056-BungeeCord-Support.patch index e292593b94..88dbeb1026 100644 --- a/CraftBukkit-Patches/0056-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0056-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From d4d3cba7e71f2f5f3580322b0a8596a178e24e68 Mon Sep 17 00:00:00 2001 +From fe10faaf51ff1054009a383c7c2110b3d8123b3e Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support @@ -75,13 +75,13 @@ index 9bfb5a2..7410718 100644 // Spigot end diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index e120462..f7a011a 100644 +index 89d0bc5..6bd1847 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -64,7 +64,11 @@ public class NetworkManager extends SimpleChannelInboundHandler { private final Queue i = Queues.newConcurrentLinkedQueue(); private final ReentrantReadWriteLock j = new ReentrantReadWriteLock(); - public Channel k; // CraftBukkit - public, PAIL: rename + public Channel k; // CraftBukkit - public, PAIL: Rename channel - private SocketAddress l; + // Spigot Start + public SocketAddress l; @@ -149,7 +149,7 @@ index f0453e6..46710d8 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 00043de..c28b6bc 100644 +index d606824..08b6f1b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1320,6 +1320,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {