CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebuild all patches for 1.4.7

Browse Source
This commit is contained in:
md_5 2013-01-18 08:58:06 +11:00
parent 2543101437
commit ec1ec77382
16 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Bukkit-Patches/0001-Spigot-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 73cb91ccc10f12f2fb506a6800aaccc8e419c8e3 Mon Sep 17 00:00:00 2001 From 0b47f2441e3f0e77be690438cd8cab6cdf716a82 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com> From: md_5 <md_5@bigpond.com>
Date: Sat, 5 Jan 2013 15:34:12 +1100 Date: Sat, 5 Jan 2013 15:34:12 +1100
Subject: [PATCH] Spigot POM Changes Subject: [PATCH] Spigot POM Changes
@ -8,7 +8,7 @@ Subject: [PATCH] Spigot POM Changes
1 file changed, 4 insertions(+), 32 deletions(-) 1 file changed, 4 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 1847285..b29f810 100644 index 5f58174..557b167 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -1,43 +1,15 @@ @@ -1,43 +1,15 @@
@ -18,7 +18,7 @@ index 1847285..b29f810 100644
- <artifactId>bukkit</artifactId> - <artifactId>bukkit</artifactId>
+ <groupId>org.spigotmc</groupId> + <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId> + <artifactId>spigot-api</artifactId>
<version>1.4.6-R0.4-SNAPSHOT</version> <version>1.4.7-R0.2-SNAPSHOT</version>
- <name>Bukkit</name> - <name>Bukkit</name>
- <url>http://www.bukkit.org</url> - <url>http://www.bukkit.org</url>
+ <name>Spigot-API</name> + <name>Spigot-API</name>

6
CraftBukkit-Patches/0001-Spigot-Changes.-This-commit-has-undergone-basic-test.patch
View File

@ -1,4 +1,4 @@
From 6b8688ec60bde099d830d49b86211ac90d295af5 Mon Sep 17 00:00:00 2001 From 5cd9601fe0de62a2b1628c0ce1816829cd609876 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com> From: md_5 <md_5@bigpond.com>
Date: Sun, 30 Dec 2012 23:56:05 -0600 Date: Sun, 30 Dec 2012 23:56:05 -0600
Subject: [PATCH 01/15] Spigot Changes. This commit has undergone basic testing Subject: [PATCH 01/15] Spigot Changes. This commit has undergone basic testing
@ -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 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index a1ed84c..576cbd3 100644 index c0ffb1b..5bebe8a 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/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 { @@ -16,6 +16,7 @@ public final class SpawnerCreature {
@ -652,7 +652,7 @@ index a1ed84c..576cbd3 100644
for (int i1 = -b0; i1 <= b0; ++i1) { for (int i1 = -b0; i1 <= b0; ++i1) {
@@ -88,13 +97,15 @@ public final class SpawnerCreature { @@ -88,13 +97,15 @@ public final class SpawnerCreature {
if (limit == 0) { if (limit == 0) {
return 0; continue;
} }
+ int mobcnt = 0; + int mobcnt = 0;
// CraftBukkit end // CraftBukkit end

2
CraftBukkit-Patches/0002-Update-Maven-Shade-Plugin-to-version-2.0.-Fixes-BUKK.patch
View File

@ -1,4 +1,4 @@
From 93138ab48fdb33e2b18aab7b2a6e0637477f900b Mon Sep 17 00:00:00 2001 From adbe94a3d91c332cb5827e9940da12012c97722c Mon Sep 17 00:00:00 2001
From: Agaricus <agaricusb@yahoo.com> From: Agaricus <agaricusb@yahoo.com>
Date: Wed, 19 Dec 2012 19:13:17 -0800 Date: Wed, 19 Dec 2012 19:13:17 -0800
Subject: [PATCH 02/15] Update Maven Shade Plugin to version 2.0. Fixes Subject: [PATCH 02/15] Update Maven Shade Plugin to version 2.0. Fixes

2
CraftBukkit-Patches/0003-Address-BUKKIT-3286-by-firing-the-inventory-close-ev.patch
View File

@ -1,4 +1,4 @@
From ddbd99b846d93e4a9685095f908af9164ad9bfc4 Mon Sep 17 00:00:00 2001 From f59427945b68403f3f4ed1bfcc6a26d5041e9fbc Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com> From: md_5 <md_5@bigpond.com>
Date: Sun, 23 Dec 2012 17:09:40 +1100 Date: Sun, 23 Dec 2012 17:09:40 +1100
Subject: [PATCH 03/15] Address BUKKIT-3286 by firing the inventory close event Subject: [PATCH 03/15] Address BUKKIT-3286 by firing the inventory close event

2
CraftBukkit-Patches/0004-Update-item-merge-logic.patch
View File

@ -1,4 +1,4 @@
From 3fcd0fe549bd3a463f3903910cff8c5b767cdc8f Mon Sep 17 00:00:00 2001 From 599c0d951444b123819b195bce1b920fd02d8215 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com> From: md_5 <md_5@bigpond.com>
Date: Sun, 23 Dec 2012 17:51:07 +1100 Date: Sun, 23 Dec 2012 17:51:07 +1100
Subject: [PATCH 04/15] Update item merge logic Subject: [PATCH 04/15] Update item merge logic

2
CraftBukkit-Patches/0005-Include-NibbleArray-from-mc-dev-for-diff-visibility.patch
View File

@ -1,4 +1,4 @@
From 0ae8cabe89ee22f70058b76f1a2820598c30c25a Mon Sep 17 00:00:00 2001 From d567ef8a06ded455b4bb6713de663c53cdda5d97 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com> From: Mike Primm <mike@primmhome.com>
Date: Fri, 14 Dec 2012 21:51:06 -0600 Date: Fri, 14 Dec 2012 21:51:06 -0600
Subject: [PATCH 05/15] Include NibbleArray from mc-dev for diff visibility Subject: [PATCH 05/15] Include NibbleArray from mc-dev for diff visibility

2
CraftBukkit-Patches/0006-Implement-lightening-of-NibbleArrays-only-allocate-b.patch
View File

@ -1,4 +1,4 @@
From f1565b3a54d4f0b94a36ff66760478508ce00ee7 Mon Sep 17 00:00:00 2001 From 1ba20eec08bf210de7c3810775c376cf8a751032 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com> From: Mike Primm <mike@primmhome.com>
Date: Sun, 23 Dec 2012 14:46:23 -0600 Date: Sun, 23 Dec 2012 14:46:23 -0600
Subject: [PATCH 06/15] Implement 'lightening' of NibbleArrays - only allocate Subject: [PATCH 06/15] Implement 'lightening' of NibbleArrays - only allocate

2
CraftBukkit-Patches/0007-Return-LOHS-to-full-operation.patch
View File

@ -1,4 +1,4 @@
From 4456a6d332e982dad87fe1bc8d1185fe3f1ac55b Mon Sep 17 00:00:00 2001 From 356c8acb983aa1e7af437c4dedf1f40272068871 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com> From: md_5 <md_5@bigpond.com>
Date: Mon, 7 Jan 2013 09:57:30 +1100 Date: Mon, 7 Jan 2013 09:57:30 +1100
Subject: [PATCH 07/15] Return LOHS to full operation. Subject: [PATCH 07/15] Return LOHS to full operation.

2
CraftBukkit-Patches/0008-Update-timeout-time-to-new-default-value.patch
View File

@ -1,4 +1,4 @@
From 7a538410153ecb475e4b2cc69913b132a42a035d Mon Sep 17 00:00:00 2001 From 17dfe46638848eb108805538071b750cdcc7b056 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com> From: md_5 <md_5@bigpond.com>
Date: Thu, 10 Jan 2013 12:33:37 +1100 Date: Thu, 10 Jan 2013 12:33:37 +1100
Subject: [PATCH 08/15] Update timeout time to new default value. Subject: [PATCH 08/15] Update timeout time to new default value.

2
CraftBukkit-Patches/0009-Per-world-view-distance.patch
View File

@ -1,4 +1,4 @@
From 17203117557c367c378a202bf378d23ff15f685f Mon Sep 17 00:00:00 2001 From 072771effa27a3f56bbf6a38f7c040edb853793b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com> From: md_5 <md_5@bigpond.com>
Date: Sat, 12 Jan 2013 19:57:45 +1100 Date: Sat, 12 Jan 2013 19:57:45 +1100
Subject: [PATCH 09/15] Per world view distance. Subject: [PATCH 09/15] Per world view distance.

6
CraftBukkit-Patches/0010-Fix-various-crop-growth-modifier-formula-issues.patch
View File

@ -1,4 +1,4 @@
From 31793fc6dc16c7bc26f4c23852d3af93bd62fb56 Mon Sep 17 00:00:00 2001 From 04d5f9d96690e42123bc114fbd262f7fe714b31f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 11 Jan 2013 11:08:45 -0500 Date: Fri, 11 Jan 2013 11:08:45 -0500
Subject: [PATCH 10/15] Fix various crop growth modifier formula issues Subject: [PATCH 10/15] Fix various crop growth modifier formula issues
@ -55,7 +55,7 @@ index 0bc7882..bf117bc 100644
int j1 = j + random.nextInt(5) - 3; int j1 = j + random.nextInt(5) - 3;
int k1 = k + random.nextInt(3) - 1; int k1 = k + random.nextInt(3) - 1;
diff --git a/src/main/java/net/minecraft/server/BlockMushroom.java b/src/main/java/net/minecraft/server/BlockMushroom.java diff --git a/src/main/java/net/minecraft/server/BlockMushroom.java b/src/main/java/net/minecraft/server/BlockMushroom.java
index 8fa8302..f66ea7a 100644 index 8fa8302..a172ba2 100644
--- a/src/main/java/net/minecraft/server/BlockMushroom.java --- a/src/main/java/net/minecraft/server/BlockMushroom.java
+++ b/src/main/java/net/minecraft/server/BlockMushroom.java +++ b/src/main/java/net/minecraft/server/BlockMushroom.java
@@ -23,7 +23,7 @@ public class BlockMushroom extends BlockFlower { @@ -23,7 +23,7 @@ public class BlockMushroom extends BlockFlower {
@ -108,7 +108,7 @@ index e8b0f96..d30fe65 100644
} else { } else {
this.grow(world, i, j, k, random, false, null, null); // CraftBukkit - added bonemeal, player and itemstack this.grow(world, i, j, k, random, false, null, null); // CraftBukkit - added bonemeal, player and itemstack
diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java
index dfaf45d..82be68e 100644 index dfaf45d..86e7bba 100644
--- a/src/main/java/net/minecraft/server/BlockStem.java --- a/src/main/java/net/minecraft/server/BlockStem.java
+++ b/src/main/java/net/minecraft/server/BlockStem.java +++ b/src/main/java/net/minecraft/server/BlockStem.java
@@ -27,7 +27,7 @@ public class BlockStem extends BlockFlower { @@ -27,7 +27,7 @@ public class BlockStem extends BlockFlower {

4
CraftBukkit-Patches/0011-Fix-mob-spawn-radius-setting-so-that-its-actually-us.patch
View File

@ -1,4 +1,4 @@
From 2bb588c4a9d3dbc9f92296114a05327837b9582b Mon Sep 17 00:00:00 2001 From 4748514f3c43a25d65ec88e3545b9b4b0316e897 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 11 Jan 2013 14:54:51 -0500 Date: Fri, 11 Jan 2013 14:54:51 -0500
Subject: [PATCH 11/15] Fix mob-spawn-radius setting so that its actually 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(-) 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 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index 576cbd3..1e4a1a5 100644 index 5bebe8a..ee084a4 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/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 { @@ -37,7 +37,10 @@ public final class SpawnerCreature {

2
CraftBukkit-Patches/0012-Add-OldChunkLoader-from-mc-dev-for-diff-visibility.patch
View File

@ -1,4 +1,4 @@
From 86541c8411e17c01e499676640272b5d092a4ecd Mon Sep 17 00:00:00 2001 From 6eb0517c4d3beb510f5a9dd1b8e5100f90bf60f2 Mon Sep 17 00:00:00 2001
From: Agaricus <agaricusb@yahoo.com> From: Agaricus <agaricusb@yahoo.com>
Date: Sun, 13 Jan 2013 03:41:38 -0800 Date: Sun, 13 Jan 2013 03:41:38 -0800
Subject: [PATCH 12/15] Add OldChunkLoader from mc-dev for diff visibility Subject: [PATCH 12/15] Add OldChunkLoader from mc-dev for diff visibility

2
CraftBukkit-Patches/0013-Fix-mcRegion-to-Anvil-conversion.patch
View File

@ -1,4 +1,4 @@
From 275e28d6d1f9e99a6a11b892e2971a2717c2efea Mon Sep 17 00:00:00 2001 From 683feb6d32ebd4956b382beffb2cec259e42b1fa Mon Sep 17 00:00:00 2001
From: Agaricus <agaricusb@yahoo.com> From: Agaricus <agaricusb@yahoo.com>
Date: Sun, 13 Jan 2013 03:49:07 -0800 Date: Sun, 13 Jan 2013 03:49:07 -0800
Subject: [PATCH 13/15] Fix mcRegion-to-Anvil conversion Subject: [PATCH 13/15] Fix mcRegion-to-Anvil conversion

2
CraftBukkit-Patches/0014-Update-pom-with-Spigot-specific-info.patch
View File

@ -1,4 +1,4 @@
From 30968c177bc0abd977e69ddf6e11a1716f019609 Mon Sep 17 00:00:00 2001 From 7d27d6c09fe9ea371ca4518ab6fd3aab1728d0f3 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com> From: md_5 <md_5@bigpond.com>
Date: Tue, 15 Jan 2013 11:48:54 +1100 Date: Tue, 15 Jan 2013 11:48:54 +1100
Subject: [PATCH 14/15] Update pom with Spigot specific info. Subject: [PATCH 14/15] Update pom with Spigot specific info.

2
CraftBukkit-Patches/0015-Update-versioning-check-to-correctly-resolve-api-ver.patch
View File

@ -1,4 +1,4 @@
From 7e1f443bfc611ee5ce828b712e2b2ad4b1c01cc8 Mon Sep 17 00:00:00 2001 From f8220d9c1df7974ff2e9b3de9a52ec0e46a8fa63 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com> From: md_5 <md_5@bigpond.com>
Date: Tue, 15 Jan 2013 15:05:02 +1100 Date: Tue, 15 Jan 2013 15:05:02 +1100
Subject: [PATCH 15/15] Update versioning check to correctly resolve api Subject: [PATCH 15/15] Update versioning check to correctly resolve api