Update upstream B/CB

2017-04-20 08:22:08 -05:00
parent 515506c3ce
commit 90927cd654
17 changed files with 47 additions and 47 deletions
--- a/Spigot-Server-Patches/Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/Configurable-packet-in-spam-threshold.patch
@@ -23,7 +23,7 @@ index d1d50f0db..2f17b9013 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a99ec1f10..ef88d568b 100644
+index 060434f32..6281fe4d5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {