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

Upstream merge: 1.7.9

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-04-17 20:47:40 +01:00
parent 6bbb74e114
commit 1f1443ed34
20 changed files with 68 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CraftBukkit-Patches/0068-BungeeCord-Support.patch
View File

@@ -1,4 +1,4 @@
From 969ea97d8abf9fb99e0a647371546068db211211 Mon Sep 17 00:00:00 2001
From e676d1bb122f90e416e214117e3a4bcc5ade4fb6 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support
@@ -93,7 +93,7 @@ index 0755d36..e380a70 100644
// Spigot end
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 1dd2227..e8e20fd 100644
index 1b080c7..31d6008 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -6,6 +6,7 @@ import javax.crypto.SecretKey;
@@ -104,7 +104,7 @@ index 1dd2227..e8e20fd 100644
import net.minecraft.util.io.netty.channel.Channel;
import net.minecraft.util.io.netty.channel.ChannelFutureListener;
import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
@@ -36,7 +37,11 @@ public class NetworkManager extends SimpleChannelInboundHandler {
@@ -37,7 +38,11 @@ public class NetworkManager extends SimpleChannelInboundHandler {
private final Queue k = Queues.newConcurrentLinkedQueue();
private final Queue l = Queues.newConcurrentLinkedQueue();
private Channel m;
@@ -117,7 +117,7 @@ index 1dd2227..e8e20fd 100644
private PacketListener o;
private EnumProtocol p;
private IChatBaseComponent q;
@@ -198,4 +203,11 @@ public class NetworkManager extends SimpleChannelInboundHandler {
@@ -207,4 +212,11 @@ public class NetworkManager extends SimpleChannelInboundHandler {
static Channel a(NetworkManager networkmanager) {
return networkmanager.m;
}
@@ -143,7 +143,7 @@ index 16d4765..39692ee 100644
this.d = EnumProtocol.a(packetdataserializer.a());
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 9c98a62..d2a378e 100644
index 4c5d77e..cd9a8f5 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -350,7 +350,7 @@ public abstract class PlayerList {
@@ -154,9 +154,9 @@ index 9c98a62..d2a378e 100644
+ PlayerLoginEvent event = new PlayerLoginEvent(player, hostname, ((java.net.InetSocketAddress) socketaddress).getAddress(), ((java.net.InetSocketAddress) loginlistener.networkManager.getRawAddress()).getAddress());
String s;
if (this.j.isBanned(gameprofile)) {
if (this.j.isBanned(gameprofile) && !this.j.get(gameprofile).e()) { // Should be hasExpired
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d7934b4..cb858a0 100644
index b4488f6..27e6fb9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1299,6 +1299,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -192,5 +192,5 @@ index 2b499fe..8bfffa5 100644
+ }
}
--
1.8.3.2
1.8.5.2.msysgit.0