From 8ecb4f1961207cace220a3cc8615bf18ec7242d0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2013 14:11:48 +1000 Subject: [PATCH] Rename some patches to be more concise. More to come once we can think of better names :p --- ...allocate-b.patch => 0014-Compressed-Nibble-Arrays.patch} | 6 ++++-- ...client.patch => 0015-Optimize-Chunk-Unload-Packet.patch} | 4 ++-- ...che.patch => 0016-Sync-Free-Chunk-Reference-Cache.patch} | 4 ++-- ...possible.patch => 0017-Highly-Optimized-Tick-Loop.patch} | 4 ++-- ...-entities.patch => 0021-Handle-Null-Tile-Entities.patch} | 4 ++-- ...ics-system-to-be-closer-to-.patch => 0023-Metrics.patch} | 5 ++--- ...-.patch => 0042-Close-Unloaded-World-s-Save-Files.patch} | 5 ++--- 7 files changed, 16 insertions(+), 16 deletions(-) rename CraftBukkit-Patches/{0014-Implement-lightening-of-NibbleArrays-only-allocate-b.patch => 0014-Compressed-Nibble-Arrays.patch} (99%) rename CraftBukkit-Patches/{0015-Optimize-packet-used-to-unload-chunks-for-the-client.patch => 0015-Optimize-Chunk-Unload-Packet.patch} (94%) rename CraftBukkit-Patches/{0016-Alternate-sync-free-but-safe-chunk-reference-cache.patch => 0016-Sync-Free-Chunk-Reference-Cache.patch} (90%) rename CraftBukkit-Patches/{0017-Tick-loop-optimization-sleep-for-as-long-as-possible.patch => 0017-Highly-Optimized-Tick-Loop.patch} (97%) rename CraftBukkit-Patches/{0021-Detect-remove-and-warn-about-null-tile-entities.patch => 0021-Handle-Null-Tile-Entities.patch} (89%) rename CraftBukkit-Patches/{0023-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch => 0023-Metrics.patch} (99%) rename CraftBukkit-Patches/{0042-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch => 0042-Close-Unloaded-World-s-Save-Files.patch} (94%) diff --git a/CraftBukkit-Patches/0014-Implement-lightening-of-NibbleArrays-only-allocate-b.patch b/CraftBukkit-Patches/0014-Compressed-Nibble-Arrays.patch similarity index 99% rename from CraftBukkit-Patches/0014-Implement-lightening-of-NibbleArrays-only-allocate-b.patch rename to CraftBukkit-Patches/0014-Compressed-Nibble-Arrays.patch index 56793f97d7..a791d226bb 100644 --- a/CraftBukkit-Patches/0014-Implement-lightening-of-NibbleArrays-only-allocate-b.patch +++ b/CraftBukkit-Patches/0014-Compressed-Nibble-Arrays.patch @@ -1,7 +1,9 @@ -From 19e16bd95f62827f53bfac9f9224c1ac7002b2a2 Mon Sep 17 00:00:00 2001 +From d7bd4e8b307d4912373cb9e59c820d059f280786 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 13 Jan 2013 03:49:07 -0800 -Subject: [PATCH] Implement 'lightening' of NibbleArrays - only allocate +Subject: [PATCH] Compressed Nibble Arrays + +Implement 'lightening' of NibbleArrays - only allocate buffers when non-trivial value Saving from 40-45% of memory use by chunk section data. diff --git a/CraftBukkit-Patches/0015-Optimize-packet-used-to-unload-chunks-for-the-client.patch b/CraftBukkit-Patches/0015-Optimize-Chunk-Unload-Packet.patch similarity index 94% rename from CraftBukkit-Patches/0015-Optimize-packet-used-to-unload-chunks-for-the-client.patch rename to CraftBukkit-Patches/0015-Optimize-Chunk-Unload-Packet.patch index 3069dca5ce..0df23950b0 100644 --- a/CraftBukkit-Patches/0015-Optimize-packet-used-to-unload-chunks-for-the-client.patch +++ b/CraftBukkit-Patches/0015-Optimize-Chunk-Unload-Packet.patch @@ -1,7 +1,7 @@ -From 7d114a50a29a22e3a987c01d3aadbc560088223b Mon Sep 17 00:00:00 2001 +From 76b8d8017d3ec9078fbe41947576068adf0bd22f Mon Sep 17 00:00:00 2001 From: Ammar Askar Date: Fri, 18 Jan 2013 16:20:01 +0500 -Subject: [PATCH] Optimize packet used to unload chunks for the client +Subject: [PATCH] Optimize Chunk Unload Packet At the moment telling a client to unload a chunk involves calling the entire chunk from memory, deflating it and then sending it through the pipes even though the client ignores it and based on the bitmap simply unloads the chunk, and to add the cherry on top, this is done on the main server thread. diff --git a/CraftBukkit-Patches/0016-Alternate-sync-free-but-safe-chunk-reference-cache.patch b/CraftBukkit-Patches/0016-Sync-Free-Chunk-Reference-Cache.patch similarity index 90% rename from CraftBukkit-Patches/0016-Alternate-sync-free-but-safe-chunk-reference-cache.patch rename to CraftBukkit-Patches/0016-Sync-Free-Chunk-Reference-Cache.patch index 2069570184..b9b7defc6f 100644 --- a/CraftBukkit-Patches/0016-Alternate-sync-free-but-safe-chunk-reference-cache.patch +++ b/CraftBukkit-Patches/0016-Sync-Free-Chunk-Reference-Cache.patch @@ -1,7 +1,7 @@ -From 43102c1d9df4854ee9376b89e9e03cce4449e021 Mon Sep 17 00:00:00 2001 +From 4776ef04d235ddc17d619f83ef88d920bf7a82fa Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Wed, 16 Jan 2013 15:27:22 -0600 -Subject: [PATCH] Alternate, sync-free-but-safe chunk reference cache +Subject: [PATCH] Sync Free Chunk Reference Cache diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/CraftBukkit-Patches/0017-Tick-loop-optimization-sleep-for-as-long-as-possible.patch b/CraftBukkit-Patches/0017-Highly-Optimized-Tick-Loop.patch similarity index 97% rename from CraftBukkit-Patches/0017-Tick-loop-optimization-sleep-for-as-long-as-possible.patch rename to CraftBukkit-Patches/0017-Highly-Optimized-Tick-Loop.patch index 5d442bc172..ba7230eef3 100644 --- a/CraftBukkit-Patches/0017-Tick-loop-optimization-sleep-for-as-long-as-possible.patch +++ b/CraftBukkit-Patches/0017-Highly-Optimized-Tick-Loop.patch @@ -1,7 +1,7 @@ -From 4afbcdda0416f8390ee171d54a61d56afa061847 Mon Sep 17 00:00:00 2001 +From 08209d4e5bba7537f7d9a8c73466005a5e254814 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Feb 2013 12:28:17 +1100 -Subject: [PATCH] Tick loop optimization - sleep for as long as possible. +Subject: [PATCH] Highly Optimized Tick Loop diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/CraftBukkit-Patches/0021-Detect-remove-and-warn-about-null-tile-entities.patch b/CraftBukkit-Patches/0021-Handle-Null-Tile-Entities.patch similarity index 89% rename from CraftBukkit-Patches/0021-Detect-remove-and-warn-about-null-tile-entities.patch rename to CraftBukkit-Patches/0021-Handle-Null-Tile-Entities.patch index 17d1c63e4a..f88c6211db 100644 --- a/CraftBukkit-Patches/0021-Detect-remove-and-warn-about-null-tile-entities.patch +++ b/CraftBukkit-Patches/0021-Handle-Null-Tile-Entities.patch @@ -1,7 +1,7 @@ -From d019622c4df444ea63166b76873f0c2d7842e533 Mon Sep 17 00:00:00 2001 +From 6572bc6b6f0a21c318a46f3c0ba95fcc8ee40fae Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Feb 2013 09:20:19 +1100 -Subject: [PATCH] Detect, remove and warn about null tile entities. +Subject: [PATCH] Handle Null Tile Entities diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/CraftBukkit-Patches/0023-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch b/CraftBukkit-Patches/0023-Metrics.patch similarity index 99% rename from CraftBukkit-Patches/0023-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch rename to CraftBukkit-Patches/0023-Metrics.patch index 67c85ed38b..11e5ce3be2 100644 --- a/CraftBukkit-Patches/0023-Metrics.-Rewrite-the-Metrics-system-to-be-closer-to-.patch +++ b/CraftBukkit-Patches/0023-Metrics.patch @@ -1,8 +1,7 @@ -From ef478d49ad459f76e82fbc30f683ebc924a2a11c Mon Sep 17 00:00:00 2001 +From 6f674b1918c210a3b06c97730ca67449e34411d2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 08:58:35 +1100 -Subject: [PATCH] Metrics. Rewrite the Metrics system to be closer to the - Bukkit version. +Subject: [PATCH] Metrics diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java diff --git a/CraftBukkit-Patches/0042-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch b/CraftBukkit-Patches/0042-Close-Unloaded-World-s-Save-Files.patch similarity index 94% rename from CraftBukkit-Patches/0042-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch rename to CraftBukkit-Patches/0042-Close-Unloaded-World-s-Save-Files.patch index b5da8637ad..783e06e813 100644 --- a/CraftBukkit-Patches/0042-Fixes-BUKKIT-3893-Close-world-save-files-when-world-.patch +++ b/CraftBukkit-Patches/0042-Close-Unloaded-World-s-Save-Files.patch @@ -1,8 +1,7 @@ -From e69033577aab7e5ace22b31a00d1e8f4a418d83a Mon Sep 17 00:00:00 2001 +From bd70f21d8650edbfefd0421d781ab09ddc2ba646 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Wed, 27 Mar 2013 01:41:54 +0200 -Subject: [PATCH] Fixes BUKKIT-3893 - Close world save files when world is - unloaded. +Subject: [PATCH] Close Unloaded World's Save Files diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java