Split chunk compression to its own patch.

CraftBukkit-Patches/0025-Netty.patch

@@ -1,6 +1,6 @@
-From c4cd485055df9b6ca52728e8c119c76592acc7c5 Mon Sep 17 00:00:00 2001
+From f3179d3cf334bf4a99db417230cc37b8997da4a6 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
-Date: Tue, 2 Jul 2013 09:05:20 +1000
+Date: Tue, 2 Jul 2013 09:06:29 +1000
 Subject: [PATCH] Netty
 
 
@@ -94,32 +94,6 @@ index 1862863..5a24f2a 100644
 +
 +    public void setSocketAddress(SocketAddress address) { k = address; } // Spigot
  }
-diff --git a/src/main/java/net/minecraft/server/Packet51MapChunk.java b/src/main/java/net/minecraft/server/Packet51MapChunk.java
-index efe102e..e488fa8 100644
---- a/src/main/java/net/minecraft/server/Packet51MapChunk.java
-+++ b/src/main/java/net/minecraft/server/Packet51MapChunk.java
-@@ -42,7 +42,7 @@ public class Packet51MapChunk extends Packet {
-         this.b = chunk.z;
-         this.e = flag;
-         ChunkMap chunkmap = a(chunk, flag, i);
--        Deflater deflater = new Deflater(-1);
-+        Deflater deflater = new Deflater(4);
- 
-         this.d = chunkmap.c;
-         this.c = chunkmap.b;
-diff --git a/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java b/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java
-index a2cd9b0..f586415 100644
---- a/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java
-+++ b/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java
-@@ -24,7 +24,7 @@ public class Packet56MapChunkBulk extends Packet {
-         @Override
-         protected Deflater initialValue() {
-             // Don't use higher compression level, slows things down too much
--            return new Deflater(6);
-+            return new Deflater(4); // Spigot - use lower compression level still
-         }
-     };
-     // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
 index 17cfacc..292fa49 100644
 --- a/src/main/java/net/minecraft/server/PendingConnection.java

CraftBukkit-Patches/0030-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From e42391b2cf58e4cfb9c1ab46114c17c515466c77 Mon Sep 17 00:00:00 2001
+From 6475f2a601cf734bf3e5d7b3971fd1c44a60d75f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 11:15:11 +1100
 Subject: [PATCH] BungeeCord Support
@@ -6,10 +6,10 @@ Subject: [PATCH] BungeeCord Support
 - Allows BungeeCord to set the players real IP address very early in the login process, so that the BungeeCord proxy IP is never even seen by a plugin.
 
 diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
-index a945892..e78781e 100644
+index 292fa49..ff32606 100644
 --- a/src/main/java/net/minecraft/server/PendingConnection.java
 +++ b/src/main/java/net/minecraft/server/PendingConnection.java
-@@ -221,4 +221,17 @@ public class PendingConnection extends Connection {
+@@ -228,4 +228,17 @@ public class PendingConnection extends Connection {
      static boolean a(PendingConnection pendingconnection, boolean flag) {
          return pendingconnection.h = flag;
      }
@@ -75,7 +75,7 @@ index 7cae665..21141f2 100644
  
      public Spigot spigot()
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 910d0de..b341ee8 100644
+index c6ec91b..31ba25f 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -7,6 +7,7 @@ import java.lang.reflect.InvocationTargetException;
@@ -86,7 +86,7 @@ index 910d0de..b341ee8 100644
  import java.util.Collections;
  import java.util.HashMap;
  import java.util.List;
-@@ -193,4 +194,14 @@ public class SpigotConfig
+@@ -207,4 +208,14 @@ public class SpigotConfig
  
          nettyThreads = getInt( "settings.netty-threads", 3 );
      }

CraftBukkit-Patches/0050-Spam-Filter-Exclusions.patch

@@ -1,4 +1,4 @@
-From 4382a5a97fe257d05dc11282c844f300811d27ac Mon Sep 17 00:00:00 2001
+From 2ccdffc75467d7bca0ae9cf2f92f9441a0aa1459 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:59:22 +1000
 Subject: [PATCH] Spam Filter Exclusions
@@ -28,10 +28,10 @@ index 998ac8d..03e0e1c 100644
                          Waitable waitable = new Waitable() {
                              @Override
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index d813492..4cac938 100644
+index 31ba25f..1eacf1e 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -204,4 +204,13 @@ public class SpigotConfig
+@@ -218,4 +218,13 @@ public class SpigotConfig
          bungeeAddresses = getList( "settings.bungeecord-addresses", bungeeAddresses );
          bungee = getBoolean( "settings.bungeecord", true );
      }

CraftBukkit-Patches/0051-Allow-Disabling-of-Command-Logging.patch

@@ -1,4 +1,4 @@
-From 25f2b26cd9798f8e2b0dbd77f323e30e263730ba Mon Sep 17 00:00:00 2001
+From f7c4774dfba4058a1c67d8d99589396abee5958b Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:01:29 +1000
 Subject: [PATCH] Allow Disabling of Command Logging
@@ -23,10 +23,10 @@ index 03e0e1c..be44514 100644
                  org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
                  return;
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 4cac938..d4a8777 100644
+index 1eacf1e..72300c9 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -213,4 +213,10 @@ public class SpigotConfig
+@@ -227,4 +227,10 @@ public class SpigotConfig
              "/skill"
          } ) );
      }

CraftBukkit-Patches/0052-Allow-Disabling-of-Command-TabComplete.patch

@@ -1,11 +1,11 @@
-From ef86c38f34b99933811189b6710f79cdfe593557 Mon Sep 17 00:00:00 2001
+From d6a9328ef91467aca75b674c256101b3c34aa859 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:05:54 +1000
 Subject: [PATCH] Allow Disabling of Command TabComplete
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1fcbd33..42600a6 100644
+index bcbf8d7..def0519 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1355,7 +1355,7 @@ public final class CraftServer implements Server {
@@ -18,10 +18,10 @@ index 1fcbd33..42600a6 100644
              player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command");
              getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex);
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 9214f16..3cccb72 100644
+index 72300c9..56204cf 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -219,4 +219,10 @@ public class SpigotConfig
+@@ -233,4 +233,10 @@ public class SpigotConfig
      {
          logCommands = getBoolean( "commands.log", true );
      }

CraftBukkit-Patches/0053-Configurable-Messages.patch

@@ -1,4 +1,4 @@
-From 1c42664186e3191cc60a48a07769707934d3a112 Mon Sep 17 00:00:00 2001
+From 14d25e3f6a553e02f594aaf9ee9be63816fc7373 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 19:21:58 +1000
 Subject: [PATCH] Configurable Messages
@@ -27,7 +27,7 @@ index fe846af..ab38736 100644
                  event.disallow(PlayerLoginEvent.Result.ALLOWED, s2);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 42600a6..9d71ae3 100644
+index def0519..58da9cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -526,7 +526,7 @@ public final class CraftServer implements Server {
@@ -40,7 +40,7 @@ index 42600a6..9d71ae3 100644
          return false;
      }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index d217794..0d53a5b 100644
+index 56204cf..7aac2de 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -15,6 +15,7 @@ import java.util.Map;
@@ -51,7 +51,7 @@ index d217794..0d53a5b 100644
  import org.bukkit.command.Command;
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.bukkit.craftbukkit.command.TicksPerSecondCommand;
-@@ -225,4 +226,18 @@ public class SpigotConfig
+@@ -239,4 +240,18 @@ public class SpigotConfig
      {
          tabComplete = getBoolean( "commands.tab-complete", true );
      }

CraftBukkit-Patches/0055-Add-Log-Filtering.patch

@@ -1,4 +1,4 @@
-From 819926c72091eb14d928f7832e53293d0d27e0b2 Mon Sep 17 00:00:00 2001
+From 8827c2719087cd4791798e31ac7bd4de2837be4e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:40:11 +1000
 Subject: [PATCH] Add Log Filtering
@@ -35,7 +35,7 @@ index 0000000..aa7e9ab
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 2998109..6528321 100644
+index 7aac2de..1f949f9 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -13,6 +13,8 @@ import java.util.HashMap;
@@ -47,7 +47,7 @@ index 2998109..6528321 100644
  import net.minecraft.server.MinecraftServer;
  import org.bukkit.Bukkit;
  import org.bukkit.ChatColor;
-@@ -240,4 +242,27 @@ public class SpigotConfig
+@@ -254,4 +256,27 @@ public class SpigotConfig
          unknownCommandMessage = transform( getString( "messages.unknown-command", "Unknown command. Type \"help\" for help." ) );
          serverFullMessage = transform( getString( "messages.server-full", "The server is full!" ) );
      }

CraftBukkit-Patches/0060-Lower-Chunk-Compression.patch

@@ -0,0 +1,36 @@
+From 53ffa727524cc9b11a6f72c173154c445cca3823 Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Tue, 2 Jul 2013 09:07:54 +1000
+Subject: [PATCH] Lower Chunk Compression
+
+Use a chunk compression level of 4 - this provides an optimal balance between speed and compression.
+
+diff --git a/src/main/java/net/minecraft/server/Packet51MapChunk.java b/src/main/java/net/minecraft/server/Packet51MapChunk.java
+index efe102e..c29b81e 100644
+--- a/src/main/java/net/minecraft/server/Packet51MapChunk.java
++++ b/src/main/java/net/minecraft/server/Packet51MapChunk.java
+@@ -42,7 +42,7 @@ public class Packet51MapChunk extends Packet {
+         this.b = chunk.z;
+         this.e = flag;
+         ChunkMap chunkmap = a(chunk, flag, i);
+-        Deflater deflater = new Deflater(-1);
++        Deflater deflater = new Deflater(4); // Spigot 4 -> -1
+ 
+         this.d = chunkmap.c;
+         this.c = chunkmap.b;
+diff --git a/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java b/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java
+index a2cd9b0..ccbb07e 100644
+--- a/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java
++++ b/src/main/java/net/minecraft/server/Packet56MapChunkBulk.java
+@@ -24,7 +24,7 @@ public class Packet56MapChunkBulk extends Packet {
+         @Override
+         protected Deflater initialValue() {
+             // Don't use higher compression level, slows things down too much
+-            return new Deflater(6);
++            return new Deflater(4); // Spigot 6 -> 4
+         }
+     };
+     // CraftBukkit end
+-- 
+1.8.1.2
+