From 48f31952373c40505e49ccf6658af1054f372507 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 18 Jan 2013 09:27:26 +1100 Subject: [PATCH] Phew. I think that is 1.4.7 done --- Bukkit-Patches/0001-Spigot-POM-Changes.patch | 2 +- ...This-commit-has-undergone-basic-test.patch | 24 +++++++++---------- ...de-Plugin-to-version-2.0.-Fixes-BUKK.patch | 4 ++-- ...286-by-firing-the-inventory-close-ev.patch | 2 +- .../0004-Update-item-merge-logic.patch | 2 +- ...rray-from-mc-dev-for-diff-visibility.patch | 2 +- ...ning-of-NibbleArrays-only-allocate-b.patch | 2 +- .../0007-Return-LOHS-to-full-operation.patch | 2 +- ...te-timeout-time-to-new-default-value.patch | 2 +- .../0009-Per-world-view-distance.patch | 2 +- ...-crop-growth-modifier-formula-issues.patch | 2 +- ...dius-setting-so-that-its-actually-us.patch | 4 ++-- ...ader-from-mc-dev-for-diff-visibility.patch | 2 +- ...013-Fix-mcRegion-to-Anvil-conversion.patch | 2 +- ...Update-pom-with-Spigot-specific-info.patch | 8 +++---- ...g-check-to-correctly-resolve-api-ver.patch | 2 +- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Bukkit-Patches/0001-Spigot-POM-Changes.patch b/Bukkit-Patches/0001-Spigot-POM-Changes.patch index fb89f6c09..4f2188c18 100644 --- a/Bukkit-Patches/0001-Spigot-POM-Changes.patch +++ b/Bukkit-Patches/0001-Spigot-POM-Changes.patch @@ -1,4 +1,4 @@ -From 0b47f2441e3f0e77be690438cd8cab6cdf716a82 Mon Sep 17 00:00:00 2001 +From 544382fe5360586b80a22f57b369208ca27e4f26 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 5 Jan 2013 15:34:12 +1100 Subject: [PATCH] Spigot POM Changes 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 008e6caa5..ae2e19c4c 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,4 +1,4 @@ -From 5cd9601fe0de62a2b1628c0ce1816829cd609876 Mon Sep 17 00:00:00 2001 +From eb68c3c4ef3419886d80143e28f314ae94fd67c8 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 @@ -69,7 +69,7 @@ index a689360..4138573 100644 + +/dependency-reduced-pom.xml diff --git a/pom.xml b/pom.xml -index 6a75d75..f331d53 100644 +index f0b0bfb..bd394ae 100644 --- a/pom.xml +++ b/pom.xml @@ -51,8 +51,8 @@ @@ -383,7 +383,7 @@ index 90e0636..051cf6d 100644 + // Spigot end } diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 1cb66df..aefc806 100644 +index b8b6d52..a7baa0f 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -61,6 +61,7 @@ public class EntityItem extends Entity { @@ -404,7 +404,7 @@ index 1cb66df..aefc806 100644 if (!this.world.isStatic && this.age >= 6000) { // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 86e6ea9..76135a2 100644 +index 99f1218..b28b364 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -48,6 +48,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -451,7 +451,7 @@ index a026c4c..cb91e30 100644 } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2f20038..b0baa85 100644 +index 4bdf8aa..4ee2b8b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -86,6 +86,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo @@ -543,7 +543,7 @@ index 2f20038..b0baa85 100644 dedicatedserver.primaryThread.start(); // Runtime.getRuntime().addShutdownHook(new ThreadShutdown(dedicatedserver)); diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index dd29094..4a213bc 100644 +index 94b62ac..80656b2 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -851,8 +851,19 @@ public class PlayerConnection extends Connection { @@ -588,7 +588,7 @@ index dd29094..4a213bc 100644 } } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index c43a6ed..ee241af 100644 +index 04ee0de..f165843 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -250,7 +250,7 @@ public abstract class PlayerList { @@ -616,7 +616,7 @@ index c43a6ed..ee241af 100644 } diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index c0ffb1b..5bebe8a 100644 +index 9b3e262..61721c4 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -16,6 +16,7 @@ public final class SpawnerCreature { @@ -668,10 +668,10 @@ index c0ffb1b..5bebe8a 100644 // CraftBukkit start long key = ((Long) iterator.next()).longValue(); -@@ -157,6 +168,12 @@ public final class SpawnerCreature { - // CraftBukkit - added a reason for spawning this creature - worldserver.addEntity(entityliving, SpawnReason.NATURAL); +@@ -158,6 +169,12 @@ public final class SpawnerCreature { a(entityliving, worldserver, f, f1, f2); + worldserver.addEntity(entityliving, SpawnReason.NATURAL); + // CraftBukkit end + // Spigot start + moblimit--; + if (moblimit <= 0) { // If we're past limit, stop spawn @@ -1657,7 +1657,7 @@ index 0000000..e30615f + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 90abcce..3e9df39 100644 +index f0e24d2..1c61830 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -212,10 +212,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { 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 48909a4fd..83a9bd109 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,4 +1,4 @@ -From adbe94a3d91c332cb5827e9940da12012c97722c Mon Sep 17 00:00:00 2001 +From 0aa49818d21da431d4d857aa08a48e3a09a26217 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 @@ -9,7 +9,7 @@ Subject: [PATCH 02/15] Update Maven Shade Plugin to version 2.0. Fixes 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml -index f331d53..4540fe2 100644 +index bd394ae..a09a7c4 100644 --- a/pom.xml +++ b/pom.xml @@ -215,7 +215,7 @@ 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 c18e42a3c..5de288063 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,4 +1,4 @@ -From f59427945b68403f3f4ed1bfcc6a26d5041e9fbc Mon Sep 17 00:00:00 2001 +From d7bf36422c9749eb335e8a025f59fa4c2e6e7d8c 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 diff --git a/CraftBukkit-Patches/0004-Update-item-merge-logic.patch b/CraftBukkit-Patches/0004-Update-item-merge-logic.patch index a84c49476..d2d1eca0d 100644 --- a/CraftBukkit-Patches/0004-Update-item-merge-logic.patch +++ b/CraftBukkit-Patches/0004-Update-item-merge-logic.patch @@ -1,4 +1,4 @@ -From 599c0d951444b123819b195bce1b920fd02d8215 Mon Sep 17 00:00:00 2001 +From 725ae4df166d45a2fc66b9756831dfb76b264b94 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 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 9629f6a85..7f9058816 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,4 +1,4 @@ -From d567ef8a06ded455b4bb6713de663c53cdda5d97 Mon Sep 17 00:00:00 2001 +From 3d833d6a67416d2fe8e69edbe66b5a99d14da13c 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 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 60b466b94..27c3d0ecd 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,4 +1,4 @@ -From 1ba20eec08bf210de7c3810775c376cf8a751032 Mon Sep 17 00:00:00 2001 +From 5fbbf3bd89e7c955b783b7a6661cba3ed4f2fc12 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 diff --git a/CraftBukkit-Patches/0007-Return-LOHS-to-full-operation.patch b/CraftBukkit-Patches/0007-Return-LOHS-to-full-operation.patch index 61676017c..07df023d5 100644 --- a/CraftBukkit-Patches/0007-Return-LOHS-to-full-operation.patch +++ b/CraftBukkit-Patches/0007-Return-LOHS-to-full-operation.patch @@ -1,4 +1,4 @@ -From 356c8acb983aa1e7af437c4dedf1f40272068871 Mon Sep 17 00:00:00 2001 +From 128c754afb0f2f6534928b2f5e5aca2b5a8f08d4 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. 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 00ef29c8e..aa1d7136f 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,4 +1,4 @@ -From 17dfe46638848eb108805538071b750cdcc7b056 Mon Sep 17 00:00:00 2001 +From 08486c720eb70e8a4582b5bbc95aa9a28ec6a1f6 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. diff --git a/CraftBukkit-Patches/0009-Per-world-view-distance.patch b/CraftBukkit-Patches/0009-Per-world-view-distance.patch index 0bbe88bf4..f1175286d 100644 --- a/CraftBukkit-Patches/0009-Per-world-view-distance.patch +++ b/CraftBukkit-Patches/0009-Per-world-view-distance.patch @@ -1,4 +1,4 @@ -From 072771effa27a3f56bbf6a38f7c040edb853793b Mon Sep 17 00:00:00 2001 +From 9cfba45c3fe4af7ba3d67cc0cfe89644a59e90b3 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. 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 bcb57f493..e05c0fd28 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,4 +1,4 @@ -From 04d5f9d96690e42123bc114fbd262f7fe714b31f Mon Sep 17 00:00:00 2001 +From c5ec70106e7831a94cbfabc05e5d93e3bf71c2b3 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 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 7e98d7876..03f94951d 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,4 +1,4 @@ -From 4748514f3c43a25d65ec88e3545b9b4b0316e897 Mon Sep 17 00:00:00 2001 +From e3ae0c14b47cd72f771ec5a9fe4f0914f3e201f4 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 @@ -9,7 +9,7 @@ Subject: [PATCH 11/15] Fix mob-spawn-radius setting so that its actually 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 5bebe8a..ee084a4 100644 +index 61721c4..124b143 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -37,7 +37,10 @@ public final class SpawnerCreature { 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 2b95c60ef..57bfb492e 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,4 +1,4 @@ -From 6eb0517c4d3beb510f5a9dd1b8e5100f90bf60f2 Mon Sep 17 00:00:00 2001 +From e1798aa0a38fc4f143c5a118d979c1f6f53f745c 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 diff --git a/CraftBukkit-Patches/0013-Fix-mcRegion-to-Anvil-conversion.patch b/CraftBukkit-Patches/0013-Fix-mcRegion-to-Anvil-conversion.patch index 5880108bf..a856e1c2b 100644 --- a/CraftBukkit-Patches/0013-Fix-mcRegion-to-Anvil-conversion.patch +++ b/CraftBukkit-Patches/0013-Fix-mcRegion-to-Anvil-conversion.patch @@ -1,4 +1,4 @@ -From 683feb6d32ebd4956b382beffb2cec259e42b1fa Mon Sep 17 00:00:00 2001 +From d7fe8059cd12f002dec190319fe7764a82e7b572 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 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 e699cce39..ecac684aa 100644 --- a/CraftBukkit-Patches/0014-Update-pom-with-Spigot-specific-info.patch +++ b/CraftBukkit-Patches/0014-Update-pom-with-Spigot-specific-info.patch @@ -1,4 +1,4 @@ -From 7d27d6c09fe9ea371ca4518ab6fd3aab1728d0f3 Mon Sep 17 00:00:00 2001 +From 4add005c6ae11c94de77e63e610e476da60a5ca8 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. @@ -8,7 +8,7 @@ Subject: [PATCH 14/15] Update pom with Spigot specific info. 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/pom.xml b/pom.xml -index 4540fe2..ea5435d 100644 +index a09a7c4..e08f4fd 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -20,7 +20,7 @@ index 4540fe2..ea5435d 100644 + org.spigotmc + spigot jar - 1.4.6-R0.4-SNAPSHOT + 1.4.7-R0.2-SNAPSHOT - CraftBukkit - http://www.bukkit.org + Spigot @@ -29,7 +29,7 @@ index 4540fe2..ea5435d 100644 UTF-8 @@ -16,25 +16,6 @@ - 1_4_6 + 1_4_R1 - 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 cc23aa551..cb089506f 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,4 +1,4 @@ -From f8220d9c1df7974ff2e9b3de9a52ec0e46a8fa63 Mon Sep 17 00:00:00 2001 +From 5cdff0943194fcf674197f5b1a2f2f4084b5aa04 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