OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 07:39:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upstream merge

Browse source
This commit is contained in:
Thinkofdeath 2015-03-19 21:31:59 +00:00 committed by Zach Brown
parent 4c22e13cf9
commit 9fa5ccba94
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CraftBukkit-Patches/0056-BungeeCord-Support.patch
View file

@ -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 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100 Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support Subject: [PATCH] BungeeCord Support
@ -75,13 +75,13 @@ index 9bfb5a2..7410718 100644
// Spigot end // Spigot end
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java 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 --- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/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<Packet> { @@ -64,7 +64,11 @@ 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;
@ -149,7 +149,7 @@ index f0453e6..46710d8 100644
@Override @Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java 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 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/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 { @@ -1320,6 +1320,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {