Update upstream B/CB

Closes GH-569
2017-01-06 15:45:59 -06:00 · 2017-01-06 15:45:59 -06:00 · b6dd3fb9d3
commit b6dd3fb9d3
parent 710f32619e
39 changed files with 111 additions and 270 deletions
--- a/Spigot-API-Patches/Expose-server-CommandMap.patch
+++ b/Spigot-API-Patches/Expose-server-CommandMap.patch
@ -55,8 +55,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
-      */
     public double[] getTPS();
+     // Paper end
 
 +    // Paper start
 +    /**