From f23a5fd90ae817a2104ada632bd88780cc6c4218 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 19 Jan 2013 19:22:25 +1100 Subject: [PATCH] Update patch fluff. --- ...t-Changes.-This-commit-has-undergone-basic-test.patch | 8 ++++---- ...e-Maven-Shade-Plugin-to-version-2.0.-Fixes-BUKK.patch | 5 ++--- ...ss-BUKKIT-3286-by-firing-the-inventory-close-ev.patch | 9 ++++----- CraftBukkit-Patches/0004-Update-item-merge-logic.patch | 4 ++-- ...ude-NibbleArray-from-mc-dev-for-diff-visibility.patch | 4 ++-- ...ment-lightening-of-NibbleArrays-only-allocate-b.patch | 4 ++-- .../0007-Return-LOHS-to-full-operation.patch | 4 ++-- .../0008-Update-timeout-time-to-new-default-value.patch | 4 ++-- CraftBukkit-Patches/0009-Per-world-view-distance.patch | 4 ++-- ...Fix-various-crop-growth-modifier-formula-issues.patch | 4 ++-- ...ob-spawn-radius-setting-so-that-its-actually-us.patch | 5 ++--- ...-OldChunkLoader-from-mc-dev-for-diff-visibility.patch | 4 ++-- .../0013-Fix-mcRegion-to-Anvil-conversion.patch | 4 ++-- .../0014-Update-pom-with-Spigot-specific-info.patch | 4 ++-- ...e-versioning-check-to-correctly-resolve-api-ver.patch | 5 ++--- ...ize-packet-used-to-unload-chunks-for-the-client.patch | 4 ++-- 16 files changed, 36 insertions(+), 40 deletions(-) diff --git a/CraftBukkit-Patches/0001-Spigot-Changes.-This-commit-has-undergone-basic-test.patch b/CraftBukkit-Patches/0001-Spigot-Changes.-This-commit-has-undergone-basic-test.patch index ae2e19c4c..ea2d07e20 100644 --- a/CraftBukkit-Patches/0001-Spigot-Changes.-This-commit-has-undergone-basic-test.patch +++ b/CraftBukkit-Patches/0001-Spigot-Changes.-This-commit-has-undergone-basic-test.patch @@ -1,9 +1,9 @@ -From eb68c3c4ef3419886d80143e28f314ae94fd67c8 Mon Sep 17 00:00:00 2001 +From d4bc3f13ea5fe1d471c3c6873e04280b91ef90d2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 30 Dec 2012 23:56:05 -0600 -Subject: [PATCH 01/15] Spigot Changes. This commit has undergone basic testing - and appears to now be safe for careful production usage. Please report any - bugs to IRC as soon as you encounter them. Long live Spigot! +Subject: [PATCH] Spigot Changes. This commit has undergone basic testing and + appears to now be safe for careful production usage. Please report any bugs + to IRC as soon as you encounter them. Long live Spigot! --- .gitignore | 2 + diff --git a/CraftBukkit-Patches/0002-Update-Maven-Shade-Plugin-to-version-2.0.-Fixes-BUKK.patch b/CraftBukkit-Patches/0002-Update-Maven-Shade-Plugin-to-version-2.0.-Fixes-BUKK.patch index 83a9bd109..be2c85fc3 100644 --- a/CraftBukkit-Patches/0002-Update-Maven-Shade-Plugin-to-version-2.0.-Fixes-BUKK.patch +++ b/CraftBukkit-Patches/0002-Update-Maven-Shade-Plugin-to-version-2.0.-Fixes-BUKK.patch @@ -1,8 +1,7 @@ -From 0aa49818d21da431d4d857aa08a48e3a09a26217 Mon Sep 17 00:00:00 2001 +From ad5f8460796c73c06af284870602c56ea509129b Mon Sep 17 00:00:00 2001 From: Agaricus Date: Wed, 19 Dec 2012 19:13:17 -0800 -Subject: [PATCH 02/15] Update Maven Shade Plugin to version 2.0. Fixes - BUKKIT-3213 +Subject: [PATCH] Update Maven Shade Plugin to version 2.0. Fixes BUKKIT-3213 --- pom.xml | 2 +- diff --git a/CraftBukkit-Patches/0003-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch b/CraftBukkit-Patches/0003-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch index 5de288063..e9c51ca05 100644 --- a/CraftBukkit-Patches/0003-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch +++ b/CraftBukkit-Patches/0003-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch @@ -1,10 +1,9 @@ -From d7bf36422c9749eb335e8a025f59fa4c2e6e7d8c Mon Sep 17 00:00:00 2001 +From d256fe9354a28a332756ec67b8204b146afded8f Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 23 Dec 2012 17:09:40 +1100 -Subject: [PATCH 03/15] Address BUKKIT-3286 by firing the inventory close event - when a secondary container is closed due to the player entity being - destroyed. This covers all edge cases such as server stop / player kick / - player quit. +Subject: [PATCH] Address BUKKIT-3286 by firing the inventory close event when + a secondary container is closed due to the player entity being destroyed. + This covers all edge cases such as server stop / player kick / player quit. --- src/main/java/net/minecraft/server/EntityHuman.java | 6 ++++++ diff --git a/CraftBukkit-Patches/0004-Update-item-merge-logic.patch b/CraftBukkit-Patches/0004-Update-item-merge-logic.patch index d2d1eca0d..0d30bcf91 100644 --- a/CraftBukkit-Patches/0004-Update-item-merge-logic.patch +++ b/CraftBukkit-Patches/0004-Update-item-merge-logic.patch @@ -1,7 +1,7 @@ -From 725ae4df166d45a2fc66b9756831dfb76b264b94 Mon Sep 17 00:00:00 2001 +From 771602a95edb220642e34e8e9ca3d205f6491561 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 23 Dec 2012 17:51:07 +1100 -Subject: [PATCH 04/15] Update item merge logic +Subject: [PATCH] Update item merge logic --- src/main/java/net/minecraft/server/World.java | 15 +++++++-------- diff --git a/CraftBukkit-Patches/0005-Include-NibbleArray-from-mc-dev-for-diff-visibility.patch b/CraftBukkit-Patches/0005-Include-NibbleArray-from-mc-dev-for-diff-visibility.patch index 7f9058816..26e3c6d4e 100644 --- a/CraftBukkit-Patches/0005-Include-NibbleArray-from-mc-dev-for-diff-visibility.patch +++ b/CraftBukkit-Patches/0005-Include-NibbleArray-from-mc-dev-for-diff-visibility.patch @@ -1,7 +1,7 @@ -From 3d833d6a67416d2fe8e69edbe66b5a99d14da13c Mon Sep 17 00:00:00 2001 +From 639bb457b93afa9a2294d94bfd0b75d64d188b98 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Fri, 14 Dec 2012 21:51:06 -0600 -Subject: [PATCH 05/15] Include NibbleArray from mc-dev for diff visibility +Subject: [PATCH] Include NibbleArray from mc-dev for diff visibility --- .../java/net/minecraft/server/NibbleArray.java | 40 ++++++++++++++++++++++ diff --git a/CraftBukkit-Patches/0006-Implement-lightening-of-NibbleArrays-only-allocate-b.patch b/CraftBukkit-Patches/0006-Implement-lightening-of-NibbleArrays-only-allocate-b.patch index 27c3d0ecd..dc981d007 100644 --- a/CraftBukkit-Patches/0006-Implement-lightening-of-NibbleArrays-only-allocate-b.patch +++ b/CraftBukkit-Patches/0006-Implement-lightening-of-NibbleArrays-only-allocate-b.patch @@ -1,7 +1,7 @@ -From 5fbbf3bd89e7c955b783b7a6661cba3ed4f2fc12 Mon Sep 17 00:00:00 2001 +From 312e0e8499c59630a87f6784285ce07f80156df9 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 23 Dec 2012 14:46:23 -0600 -Subject: [PATCH 06/15] Implement 'lightening' of NibbleArrays - only allocate +Subject: [PATCH] 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/0007-Return-LOHS-to-full-operation.patch b/CraftBukkit-Patches/0007-Return-LOHS-to-full-operation.patch index 07df023d5..8744d74e5 100644 --- a/CraftBukkit-Patches/0007-Return-LOHS-to-full-operation.patch +++ b/CraftBukkit-Patches/0007-Return-LOHS-to-full-operation.patch @@ -1,7 +1,7 @@ -From 128c754afb0f2f6534928b2f5e5aca2b5a8f08d4 Mon Sep 17 00:00:00 2001 +From 01d137f66a7e0e3c2288742a19fc7c56028525b2 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 7 Jan 2013 09:57:30 +1100 -Subject: [PATCH 07/15] Return LOHS to full operation. +Subject: [PATCH] Return LOHS to full operation. --- src/main/java/org/bukkit/craftbukkit/util/LongHashSet.java | 4 ++-- diff --git a/CraftBukkit-Patches/0008-Update-timeout-time-to-new-default-value.patch b/CraftBukkit-Patches/0008-Update-timeout-time-to-new-default-value.patch index aa1d7136f..649431932 100644 --- a/CraftBukkit-Patches/0008-Update-timeout-time-to-new-default-value.patch +++ b/CraftBukkit-Patches/0008-Update-timeout-time-to-new-default-value.patch @@ -1,7 +1,7 @@ -From 08486c720eb70e8a4582b5bbc95aa9a28ec6a1f6 Mon Sep 17 00:00:00 2001 +From 5d0333bc35dd3f5d965a26a1b6c489261ad0da0b Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 10 Jan 2013 12:33:37 +1100 -Subject: [PATCH 08/15] Update timeout time to new default value. +Subject: [PATCH] Update timeout time to new default value. --- src/main/java/org/bukkit/craftbukkit/CraftServer.java | 9 ++++++++- diff --git a/CraftBukkit-Patches/0009-Per-world-view-distance.patch b/CraftBukkit-Patches/0009-Per-world-view-distance.patch index f1175286d..d2e3f5b6c 100644 --- a/CraftBukkit-Patches/0009-Per-world-view-distance.patch +++ b/CraftBukkit-Patches/0009-Per-world-view-distance.patch @@ -1,7 +1,7 @@ -From 9cfba45c3fe4af7ba3d67cc0cfe89644a59e90b3 Mon Sep 17 00:00:00 2001 +From 9b45e7ed5ccba94e2730105b6234da7945fa8be3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 12 Jan 2013 19:57:45 +1100 -Subject: [PATCH 09/15] Per world view distance. +Subject: [PATCH] Per world view distance. --- src/main/java/net/minecraft/server/WorldServer.java | 2 +- diff --git a/CraftBukkit-Patches/0010-Fix-various-crop-growth-modifier-formula-issues.patch b/CraftBukkit-Patches/0010-Fix-various-crop-growth-modifier-formula-issues.patch index e05c0fd28..edb0eb3b7 100644 --- a/CraftBukkit-Patches/0010-Fix-various-crop-growth-modifier-formula-issues.patch +++ b/CraftBukkit-Patches/0010-Fix-various-crop-growth-modifier-formula-issues.patch @@ -1,7 +1,7 @@ -From c5ec70106e7831a94cbfabc05e5d93e3bf71c2b3 Mon Sep 17 00:00:00 2001 +From 383d4ee7388ec2e58dee08aa2338746459f82d15 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 11 Jan 2013 11:08:45 -0500 -Subject: [PATCH 10/15] Fix various crop growth modifier formula issues +Subject: [PATCH] Fix various crop growth modifier formula issues --- src/main/java/net/minecraft/server/BlockCactus.java | 2 +- diff --git a/CraftBukkit-Patches/0011-Fix-mob-spawn-radius-setting-so-that-its-actually-us.patch b/CraftBukkit-Patches/0011-Fix-mob-spawn-radius-setting-so-that-its-actually-us.patch index 03f94951d..5b7daafb0 100644 --- a/CraftBukkit-Patches/0011-Fix-mob-spawn-radius-setting-so-that-its-actually-us.patch +++ b/CraftBukkit-Patches/0011-Fix-mob-spawn-radius-setting-so-that-its-actually-us.patch @@ -1,8 +1,7 @@ -From e3ae0c14b47cd72f771ec5a9fe4f0914f3e201f4 Mon Sep 17 00:00:00 2001 +From c7e9f844a4bee1592da4705c09028546a546d426 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 11 Jan 2013 14:54:51 -0500 -Subject: [PATCH 11/15] Fix mob-spawn-radius setting so that its actually - used... +Subject: [PATCH] Fix mob-spawn-radius setting so that its actually used... --- src/main/java/net/minecraft/server/SpawnerCreature.java | 5 ++++- diff --git a/CraftBukkit-Patches/0012-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch b/CraftBukkit-Patches/0012-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch index 57bfb492e..ef16b570b 100644 --- a/CraftBukkit-Patches/0012-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch +++ b/CraftBukkit-Patches/0012-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch @@ -1,7 +1,7 @@ -From e1798aa0a38fc4f143c5a118d979c1f6f53f745c Mon Sep 17 00:00:00 2001 +From 929f3cb5c059f90180b7a3a71fb2079c99baa133 Mon Sep 17 00:00:00 2001 From: Agaricus Date: Sun, 13 Jan 2013 03:41:38 -0800 -Subject: [PATCH 12/15] Add OldChunkLoader from mc-dev for diff visibility +Subject: [PATCH] Add OldChunkLoader from mc-dev for diff visibility --- .../java/net/minecraft/server/OldChunkLoader.java | 120 +++++++++++++++++++++ diff --git a/CraftBukkit-Patches/0013-Fix-mcRegion-to-Anvil-conversion.patch b/CraftBukkit-Patches/0013-Fix-mcRegion-to-Anvil-conversion.patch index a856e1c2b..ec1e814e5 100644 --- a/CraftBukkit-Patches/0013-Fix-mcRegion-to-Anvil-conversion.patch +++ b/CraftBukkit-Patches/0013-Fix-mcRegion-to-Anvil-conversion.patch @@ -1,7 +1,7 @@ -From d7fe8059cd12f002dec190319fe7764a82e7b572 Mon Sep 17 00:00:00 2001 +From 2de29f11f996690e92c275f9fcd0eabcb84972bf Mon Sep 17 00:00:00 2001 From: Agaricus Date: Sun, 13 Jan 2013 03:49:07 -0800 -Subject: [PATCH 13/15] Fix mcRegion-to-Anvil conversion +Subject: [PATCH] Fix mcRegion-to-Anvil conversion --- src/main/java/net/minecraft/server/OldChunkLoader.java | 8 +++++--- diff --git a/CraftBukkit-Patches/0014-Update-pom-with-Spigot-specific-info.patch b/CraftBukkit-Patches/0014-Update-pom-with-Spigot-specific-info.patch index ecac684aa..9db20307e 100644 --- a/CraftBukkit-Patches/0014-Update-pom-with-Spigot-specific-info.patch +++ b/CraftBukkit-Patches/0014-Update-pom-with-Spigot-specific-info.patch @@ -1,7 +1,7 @@ -From 4add005c6ae11c94de77e63e610e476da60a5ca8 Mon Sep 17 00:00:00 2001 +From 820fbd7ead50871bf254add75d4e8cd68d9a40a5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 15 Jan 2013 11:48:54 +1100 -Subject: [PATCH 14/15] Update pom with Spigot specific info. +Subject: [PATCH] Update pom with Spigot specific info. --- pom.xml | 34 ++++------------------------------ diff --git a/CraftBukkit-Patches/0015-Update-versioning-check-to-correctly-resolve-api-ver.patch b/CraftBukkit-Patches/0015-Update-versioning-check-to-correctly-resolve-api-ver.patch index cb089506f..5362a2cfa 100644 --- a/CraftBukkit-Patches/0015-Update-versioning-check-to-correctly-resolve-api-ver.patch +++ b/CraftBukkit-Patches/0015-Update-versioning-check-to-correctly-resolve-api-ver.patch @@ -1,8 +1,7 @@ -From 5cdff0943194fcf674197f5b1a2f2f4084b5aa04 Mon Sep 17 00:00:00 2001 +From f3facbff6ce361fb4ab59d3814ce384f8b2a636b Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 15 Jan 2013 15:05:02 +1100 -Subject: [PATCH 15/15] Update versioning check to correctly resolve api - version. +Subject: [PATCH] Update versioning check to correctly resolve api version. --- src/main/java/org/bukkit/craftbukkit/util/Versioning.java | 2 +- diff --git a/CraftBukkit-Patches/0016-Optimize-packet-used-to-unload-chunks-for-the-client.patch b/CraftBukkit-Patches/0016-Optimize-packet-used-to-unload-chunks-for-the-client.patch index 62472bc86..44ef163fd 100644 --- a/CraftBukkit-Patches/0016-Optimize-packet-used-to-unload-chunks-for-the-client.patch +++ b/CraftBukkit-Patches/0016-Optimize-packet-used-to-unload-chunks-for-the-client.patch @@ -1,7 +1,7 @@ -From 1581cbd0691eea89081a0a9e387ee70821f09485 Mon Sep 17 00:00:00 2001 +From 665d2d79c486bf4d8ee4efe98ef0810f96b43c8c Mon Sep 17 00:00:00 2001 From: Ammar Askar Date: Fri, 18 Jan 2013 16:20:01 +0500 -Subject: [PATCH 16/16] Optimize packet used to unload chunks for the client +Subject: [PATCH] Optimize packet used to unload chunks for the client 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. ---