From def021fb9bc7d29714d94c956030332398689338 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 21 Mar 2016 20:46:54 -0400 Subject: [PATCH] fix rebuild patches and rebuild current patches --- ...=> 0027-Custom-replacement-for-eaten-items.patch} | 4 ++-- ...lingBlock-and-TNTPrimed-source-location-API.patch | 12 ++++++------ .../0085-Allow-Reloading-of-Custom-Permissions.patch | 8 ++++---- ...atch => 0086-Invalidate-Metadata-on-reload.patch} | 6 +++--- ...ashing.patch => 0087-Undead-horse-leashing.patch} | 4 ++-- ...ug.patch => 0088-Fix-Furnace-cook-time-bug.patch} | 4 ++-- ...h => 0089-Handle-Item-Meta-Inconsistencies.patch} | 4 ++-- ...Configurable-Non-Player-Arrow-Despawn-Rate.patch} | 4 ++-- ... => 0091-Optimize-BlockStateList-BlockData.patch} | 2 +- ...thods.patch => 0092-Add-World-Util-Methods.patch} | 2 +- ... => 0093-Optimized-Light-Level-Comparisons.patch} | 2 +- ...tch => 0094-Pass-world-to-Village-creation.patch} | 4 ++-- ...=> 0095-Custom-replacement-for-eaten-items.patch} | 2 +- ...atch => 0096-Set-health-before-death-event.patch} | 2 +- ...N-health-absorb-values-and-repair-bad-data.patch} | 4 ++-- ...0098-Catch-Async-PlayerChunkMap-operations.patch} | 4 ++-- ...player-as-invulnerable-if-they-re-changing.patch} | 4 ++-- ...-offline-mode-in-whitelist-command-as-well.patch} | 4 ++-- rebuildPatches.sh | 2 ++ 19 files changed, 40 insertions(+), 38 deletions(-) rename Spigot-API-Patches/{0026-Custom-replacement-for-eaten-items.patch => 0027-Custom-replacement-for-eaten-items.patch} (95%) rename Spigot-Server-Patches/{0085-Invalidate-Metadata-on-reload.patch => 0086-Invalidate-Metadata-on-reload.patch} (98%) rename Spigot-Server-Patches/{0086-Undead-horse-leashing.patch => 0087-Undead-horse-leashing.patch} (95%) rename Spigot-Server-Patches/{0087-Fix-Furnace-cook-time-bug.patch => 0088-Fix-Furnace-cook-time-bug.patch} (94%) rename Spigot-Server-Patches/{0088-Handle-Item-Meta-Inconsistencies.patch => 0089-Handle-Item-Meta-Inconsistencies.patch} (99%) rename Spigot-Server-Patches/{0089-Configurable-Non-Player-Arrow-Despawn-Rate.patch => 0090-Configurable-Non-Player-Arrow-Despawn-Rate.patch} (96%) rename Spigot-Server-Patches/{0090-Optimize-BlockStateList-BlockData.patch => 0091-Optimize-BlockStateList-BlockData.patch} (97%) rename Spigot-Server-Patches/{0091-Add-World-Util-Methods.patch => 0092-Add-World-Util-Methods.patch} (98%) rename Spigot-Server-Patches/{0092-Optimized-Light-Level-Comparisons.patch => 0093-Optimized-Light-Level-Comparisons.patch} (99%) rename Spigot-Server-Patches/{0093-Pass-world-to-Village-creation.patch => 0094-Pass-world-to-Village-creation.patch} (96%) rename Spigot-Server-Patches/{0094-Custom-replacement-for-eaten-items.patch => 0095-Custom-replacement-for-eaten-items.patch} (96%) rename Spigot-Server-Patches/{0095-Set-health-before-death-event.patch => 0096-Set-health-before-death-event.patch} (96%) rename Spigot-Server-Patches/{0096-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0097-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (96%) rename Spigot-Server-Patches/{0097-Catch-Async-PlayerChunkMap-operations.patch => 0098-Catch-Async-PlayerChunkMap-operations.patch} (91%) rename Spigot-Server-Patches/{0098-Only-mark-player-as-invulnerable-if-they-re-changing.patch => 0099-Only-mark-player-as-invulnerable-if-they-re-changing.patch} (96%) rename Spigot-Server-Patches/{0099-Support-offline-mode-in-whitelist-command-as-well.patch => 0100-Support-offline-mode-in-whitelist-command-as-well.patch} (98%) diff --git a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch b/Spigot-API-Patches/0027-Custom-replacement-for-eaten-items.patch similarity index 95% rename from Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch rename to Spigot-API-Patches/0027-Custom-replacement-for-eaten-items.patch index 71f773aee..9f76655ea 100644 --- a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch +++ b/Spigot-API-Patches/0027-Custom-replacement-for-eaten-items.patch @@ -1,4 +1,4 @@ -From cfcfc4e550f7445c1817d2c8c1fd1c7f55708cd5 Mon Sep 17 00:00:00 2001 +From 11d6fcf537a9f03b483874c2c2dee87a71fe19ca Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:05:21 -0400 Subject: [PATCH] Custom replacement for eaten items @@ -42,5 +42,5 @@ index 8ab76b1..42aad88 100644 return this.isCancelled; } -- -2.7.2 +2.7.4 diff --git a/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch b/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch index 9bdb4deba..ce1ebe73e 100644 --- a/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch +++ b/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch @@ -1,4 +1,4 @@ -From 8ae5f231332c2baa03788b45356dd188563dd4bb Mon Sep 17 00:00:00 2001 +From e7fb6e898e23e7bf59f294a83f1890bb3afd6054 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 23:45:08 -0600 Subject: [PATCH] FallingBlock and TNTPrimed source location API @@ -193,10 +193,10 @@ index 564ea37..1820c7b 100644 public EntityLiving getSource() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 83e3003..25edfb8 100644 +index a487c2f..33c3428 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -921,7 +921,10 @@ public class CraftWorld implements World { +@@ -916,7 +916,10 @@ public class CraftWorld implements World { double y = location.getBlockY() + 0.5; double z = location.getBlockZ() + 0.5; @@ -208,7 +208,7 @@ index 83e3003..25edfb8 100644 entity.ticksLived = 1; world.addEntity(entity, SpawnReason.CUSTOM); -@@ -957,7 +960,10 @@ public class CraftWorld implements World { +@@ -952,7 +955,10 @@ public class CraftWorld implements World { int type = CraftMagicNumbers.getId(blockData.getBlock()); int data = blockData.getBlock().toLegacyData(blockData); @@ -220,7 +220,7 @@ index 83e3003..25edfb8 100644 } else if (Projectile.class.isAssignableFrom(clazz)) { if (Snowball.class.isAssignableFrom(clazz)) { entity = new EntitySnowball(world, x, y, z); -@@ -1162,7 +1168,8 @@ public class CraftWorld implements World { +@@ -1157,7 +1163,8 @@ public class CraftWorld implements World { throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location); } } else if (TNTPrimed.class.isAssignableFrom(clazz)) { @@ -263,5 +263,5 @@ index c493c9c..eea3238 100644 + // Paper end } -- -2.7.2.windows.1 +2.7.4 diff --git a/Spigot-Server-Patches/0085-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0085-Allow-Reloading-of-Custom-Permissions.patch index 053e29540..e16f8a5a0 100644 --- a/Spigot-Server-Patches/0085-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0085-Allow-Reloading-of-Custom-Permissions.patch @@ -1,4 +1,4 @@ -From 8b0fab818c1a07dab47347144e4b53e395cf4e99 Mon Sep 17 00:00:00 2001 +From 893bd0213743e6ad60d20639bee6a893fccc8244 Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:30:17 -0400 Subject: [PATCH] Allow Reloading of Custom Permissions @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions https://github.com/PaperMC/Paper/issues/49 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index cb9906a..3977bff 100644 +index 2493a23..0aea5df 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1833,4 +1833,12 @@ public final class CraftServer implements Server { +@@ -1834,4 +1834,12 @@ public final class CraftServer implements Server { { return spigot; } @@ -23,5 +23,5 @@ index cb9906a..3977bff 100644 + // Paper end } -- -2.5.0 +2.7.4 diff --git a/Spigot-Server-Patches/0085-Invalidate-Metadata-on-reload.patch b/Spigot-Server-Patches/0086-Invalidate-Metadata-on-reload.patch similarity index 98% rename from Spigot-Server-Patches/0085-Invalidate-Metadata-on-reload.patch rename to Spigot-Server-Patches/0086-Invalidate-Metadata-on-reload.patch index 03e58e61e..a139f59cf 100644 --- a/Spigot-Server-Patches/0085-Invalidate-Metadata-on-reload.patch +++ b/Spigot-Server-Patches/0086-Invalidate-Metadata-on-reload.patch @@ -1,4 +1,4 @@ -From e8d5f3cee9c2a6fe8125553eadbb0b198368f560 Mon Sep 17 00:00:00 2001 +From adc937ad9523688f22f32b2ae51a5f376740e9fa Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:50:14 -0400 Subject: [PATCH] Invalidate Metadata on reload @@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive This will invalidate metadata on reload so it does not crash everything if a plugin uses it. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2493a23..d677731 100644 +index 0aea5df..21fb010 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1,31 +1,24 @@ @@ -166,5 +166,5 @@ index 2493a23..d677731 100644 commandMap.clearCommands(); resetRecipes(); -- -2.7.3 +2.7.4 diff --git a/Spigot-Server-Patches/0086-Undead-horse-leashing.patch b/Spigot-Server-Patches/0087-Undead-horse-leashing.patch similarity index 95% rename from Spigot-Server-Patches/0086-Undead-horse-leashing.patch rename to Spigot-Server-Patches/0087-Undead-horse-leashing.patch index f03af43cc..174db6bd6 100644 --- a/Spigot-Server-Patches/0086-Undead-horse-leashing.patch +++ b/Spigot-Server-Patches/0087-Undead-horse-leashing.patch @@ -1,4 +1,4 @@ -From 2629402186e7795e1e17a135a3e965758f55d300 Mon Sep 17 00:00:00 2001 +From 402c065f538cc171d8aa3dc58c92194b4c8ded70 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 14:19:19 -0400 Subject: [PATCH] Undead horse leashing @@ -32,5 +32,5 @@ index ec1e7f6..19532b8 100644 } -- -2.7.3 +2.7.4 diff --git a/Spigot-Server-Patches/0087-Fix-Furnace-cook-time-bug.patch b/Spigot-Server-Patches/0088-Fix-Furnace-cook-time-bug.patch similarity index 94% rename from Spigot-Server-Patches/0087-Fix-Furnace-cook-time-bug.patch rename to Spigot-Server-Patches/0088-Fix-Furnace-cook-time-bug.patch index f2421b447..14484d600 100644 --- a/Spigot-Server-Patches/0087-Fix-Furnace-cook-time-bug.patch +++ b/Spigot-Server-Patches/0088-Fix-Furnace-cook-time-bug.patch @@ -1,4 +1,4 @@ -From 76ca6e71647989c7af2780e5246f9e9ae389df13 Mon Sep 17 00:00:00 2001 +From a23d5f6af834a0d5c3d37defbe33161713419c12 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 14:24:53 -0400 Subject: [PATCH] Fix Furnace cook time bug @@ -22,5 +22,5 @@ index 1b17ca6..0a20cec 100644 this.burn(); flag1 = true; -- -2.7.3 +2.7.4 diff --git a/Spigot-Server-Patches/0088-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0089-Handle-Item-Meta-Inconsistencies.patch similarity index 99% rename from Spigot-Server-Patches/0088-Handle-Item-Meta-Inconsistencies.patch rename to Spigot-Server-Patches/0089-Handle-Item-Meta-Inconsistencies.patch index a0353cb44..68cf438bb 100644 --- a/Spigot-Server-Patches/0088-Handle-Item-Meta-Inconsistencies.patch +++ b/Spigot-Server-Patches/0089-Handle-Item-Meta-Inconsistencies.patch @@ -1,4 +1,4 @@ -From efe95b788587939d67d7add7914c4272aef31230 Mon Sep 17 00:00:00 2001 +From f6b2eeddbd26f39eb3a0ab87f484247ecf801bd9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 May 2015 23:00:19 -0400 Subject: [PATCH] Handle Item Meta Inconsistencies @@ -293,5 +293,5 @@ index 22cc267..94f2ba0 100644 private final Spigot spigot = new Spigot() { -- -2.7.3 +2.7.4 diff --git a/Spigot-Server-Patches/0089-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0090-Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 96% rename from Spigot-Server-Patches/0089-Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to Spigot-Server-Patches/0090-Configurable-Non-Player-Arrow-Despawn-Rate.patch index fe5ae9d77..8a440ccdc 100644 --- a/Spigot-Server-Patches/0089-Configurable-Non-Player-Arrow-Despawn-Rate.patch +++ b/Spigot-Server-Patches/0090-Configurable-Non-Player-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From d921e3e3b88a48583a089c24d5372d27e6bd4ea2 Mon Sep 17 00:00:00 2001 +From a09015c323fe1814a49cda6a08a69575fa75abde Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 15:12:22 -0400 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate @@ -37,5 +37,5 @@ index 5ccdb88..e5f1b71 100644 } } else { -- -2.7.3 +2.7.4 diff --git a/Spigot-Server-Patches/0090-Optimize-BlockStateList-BlockData.patch b/Spigot-Server-Patches/0091-Optimize-BlockStateList-BlockData.patch similarity index 97% rename from Spigot-Server-Patches/0090-Optimize-BlockStateList-BlockData.patch rename to Spigot-Server-Patches/0091-Optimize-BlockStateList-BlockData.patch index f2ea606fc..b693ac4ed 100644 --- a/Spigot-Server-Patches/0090-Optimize-BlockStateList-BlockData.patch +++ b/Spigot-Server-Patches/0091-Optimize-BlockStateList-BlockData.patch @@ -1,4 +1,4 @@ -From 2adb5317b40c4ec51aa63cfb68ba1e11d65dfd82 Mon Sep 17 00:00:00 2001 +From a408eea0372908e8cb7f4795b11de5e64e571564 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 19:15:44 -0400 Subject: [PATCH] Optimize BlockStateList/BlockData diff --git a/Spigot-Server-Patches/0091-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0092-Add-World-Util-Methods.patch similarity index 98% rename from Spigot-Server-Patches/0091-Add-World-Util-Methods.patch rename to Spigot-Server-Patches/0092-Add-World-Util-Methods.patch index 10c2d63d7..8bdad61a7 100644 --- a/Spigot-Server-Patches/0091-Add-World-Util-Methods.patch +++ b/Spigot-Server-Patches/0092-Add-World-Util-Methods.patch @@ -1,4 +1,4 @@ -From 916b06f2f76736a0b05010a465ff5e0c16b7fdcb Mon Sep 17 00:00:00 2001 +From 712fbf766b9e252fa208226bce6b7941327fefbe Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 20:16:03 -0400 Subject: [PATCH] Add World Util Methods diff --git a/Spigot-Server-Patches/0092-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0093-Optimized-Light-Level-Comparisons.patch similarity index 99% rename from Spigot-Server-Patches/0092-Optimized-Light-Level-Comparisons.patch rename to Spigot-Server-Patches/0093-Optimized-Light-Level-Comparisons.patch index 624ec3244..f3456bf38 100644 --- a/Spigot-Server-Patches/0092-Optimized-Light-Level-Comparisons.patch +++ b/Spigot-Server-Patches/0093-Optimized-Light-Level-Comparisons.patch @@ -1,4 +1,4 @@ -From 0b102494f2d663eb3fd386a7e692cfd46b84a4f1 Mon Sep 17 00:00:00 2001 +From 5b08a9f1fa943eb16b203d050770c32a286b180e Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 21:22:56 -0400 Subject: [PATCH] Optimized Light Level Comparisons diff --git a/Spigot-Server-Patches/0093-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0094-Pass-world-to-Village-creation.patch similarity index 96% rename from Spigot-Server-Patches/0093-Pass-world-to-Village-creation.patch rename to Spigot-Server-Patches/0094-Pass-world-to-Village-creation.patch index c3871ec76..53fb5aea3 100644 --- a/Spigot-Server-Patches/0093-Pass-world-to-Village-creation.patch +++ b/Spigot-Server-Patches/0094-Pass-world-to-Village-creation.patch @@ -1,4 +1,4 @@ -From 7ff983308b59dcb1c547aff7950be49305211165 Mon Sep 17 00:00:00 2001 +From c53302d6e6686fb9d6360777aa9c350dd0997eaa Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 19 Mar 2016 15:16:54 -0400 Subject: [PATCH] Pass world to Village creation @@ -41,5 +41,5 @@ index 932eeb7..06a06ea 100644 if (gameprofile != null) { -- -2.7.3 +2.7.4 diff --git a/Spigot-Server-Patches/0094-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0095-Custom-replacement-for-eaten-items.patch similarity index 96% rename from Spigot-Server-Patches/0094-Custom-replacement-for-eaten-items.patch rename to Spigot-Server-Patches/0095-Custom-replacement-for-eaten-items.patch index 4a55e286f..9413ebcab 100644 --- a/Spigot-Server-Patches/0094-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0095-Custom-replacement-for-eaten-items.patch @@ -1,4 +1,4 @@ -From 1de7a4205fd60aa30189386d3bf85aef1ad29405 Mon Sep 17 00:00:00 2001 +From 60b0a12eed714b7e17291eca2b28ec2cb74ad1dc Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:07:20 -0400 Subject: [PATCH] Custom replacement for eaten items diff --git a/Spigot-Server-Patches/0095-Set-health-before-death-event.patch b/Spigot-Server-Patches/0096-Set-health-before-death-event.patch similarity index 96% rename from Spigot-Server-Patches/0095-Set-health-before-death-event.patch rename to Spigot-Server-Patches/0096-Set-health-before-death-event.patch index 2fe40ebbf..d49769055 100644 --- a/Spigot-Server-Patches/0095-Set-health-before-death-event.patch +++ b/Spigot-Server-Patches/0096-Set-health-before-death-event.patch @@ -1,4 +1,4 @@ -From 047f45354145583cbe356066478979ae5e30ca56 Mon Sep 17 00:00:00 2001 +From 06c57c6d719e95aae1a4e88a3b7fb19f387a24d6 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 19 Jul 2015 16:51:38 -0400 Subject: [PATCH] Set health before death event diff --git a/Spigot-Server-Patches/0096-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0097-handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 96% rename from Spigot-Server-Patches/0096-handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to Spigot-Server-Patches/0097-handle-NaN-health-absorb-values-and-repair-bad-data.patch index de4b5034b..7db229592 100644 --- a/Spigot-Server-Patches/0096-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0097-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,4 +1,4 @@ -From da36bdf1db31abd6f92054f6fd35eb65b5b5f6cf Mon Sep 17 00:00:00 2001 +From c35be5f9690d14316f9a296e7021dc98d9faaca2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 27 Sep 2015 01:18:02 -0400 Subject: [PATCH] handle NaN health/absorb values and repair bad data @@ -44,7 +44,7 @@ index 3e92dcc..cef1117 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b2b2bf4..4bcfe96 100644 +index 46533fb..c5879c2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1371,6 +1371,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0097-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0098-Catch-Async-PlayerChunkMap-operations.patch similarity index 91% rename from Spigot-Server-Patches/0097-Catch-Async-PlayerChunkMap-operations.patch rename to Spigot-Server-Patches/0098-Catch-Async-PlayerChunkMap-operations.patch index 58ab3b7eb..07062742e 100644 --- a/Spigot-Server-Patches/0097-Catch-Async-PlayerChunkMap-operations.patch +++ b/Spigot-Server-Patches/0098-Catch-Async-PlayerChunkMap-operations.patch @@ -1,4 +1,4 @@ -From b5dd19cacf556dcf9fe1e3654753e5c57ef5aa57 Mon Sep 17 00:00:00 2001 +From 5bf55126d139a48620722be6c74abd0d07d04b6b Mon Sep 17 00:00:00 2001 From: Daniel Ennis Date: Sun, 20 Mar 2016 15:22:42 -0400 Subject: [PATCH] Catch Async PlayerChunkMap operations @@ -22,5 +22,5 @@ index 5421026..7100710 100644 long i = d(chunkcoordintpair.x, chunkcoordintpair.z); -- -2.5.4 (Apple Git-61) +2.7.4 diff --git a/Spigot-Server-Patches/0098-Only-mark-player-as-invulnerable-if-they-re-changing.patch b/Spigot-Server-Patches/0099-Only-mark-player-as-invulnerable-if-they-re-changing.patch similarity index 96% rename from Spigot-Server-Patches/0098-Only-mark-player-as-invulnerable-if-they-re-changing.patch rename to Spigot-Server-Patches/0099-Only-mark-player-as-invulnerable-if-they-re-changing.patch index 7cfe8f99a..41d33ac0c 100644 --- a/Spigot-Server-Patches/0098-Only-mark-player-as-invulnerable-if-they-re-changing.patch +++ b/Spigot-Server-Patches/0099-Only-mark-player-as-invulnerable-if-they-re-changing.patch @@ -1,4 +1,4 @@ -From 47e641803ce55b26359768995f0790e66d013109 Mon Sep 17 00:00:00 2001 +From a1e0945bc90bf87dbad2b500ea020adf90da906e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 20 Mar 2016 19:40:51 -0500 Subject: [PATCH] Only mark player as invulnerable if they're changing worlds @@ -41,5 +41,5 @@ index 344abbb..c6bad9e 100644 // THE_END -> NORMAL; use bed if available, otherwise default spawn exit = ((org.bukkit.craftbukkit.entity.CraftPlayer) entityplayer.getBukkitEntity()).getBedSpawnLocation(); -- -2.7.4.windows.1 +2.7.4 diff --git a/Spigot-Server-Patches/0099-Support-offline-mode-in-whitelist-command-as-well.patch b/Spigot-Server-Patches/0100-Support-offline-mode-in-whitelist-command-as-well.patch similarity index 98% rename from Spigot-Server-Patches/0099-Support-offline-mode-in-whitelist-command-as-well.patch rename to Spigot-Server-Patches/0100-Support-offline-mode-in-whitelist-command-as-well.patch index 44f25f533..2ed2dab7d 100644 --- a/Spigot-Server-Patches/0099-Support-offline-mode-in-whitelist-command-as-well.patch +++ b/Spigot-Server-Patches/0100-Support-offline-mode-in-whitelist-command-as-well.patch @@ -1,4 +1,4 @@ -From e246c430c32e0e7886e2509ab2796506fc94aaa2 Mon Sep 17 00:00:00 2001 +From 0bc8b2e1cf0e3ecdd81fba1bf77530081bd40abc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 21 Mar 2016 00:19:18 -0500 Subject: [PATCH] Support offline mode in whitelist command as well @@ -94,5 +94,5 @@ index b52bf74..2d08a36 100644 + // Paper end } -- -2.7.3 +2.7.4 diff --git a/rebuildPatches.sh b/rebuildPatches.sh index b18d70b29..dfcccf6d1 100755 --- a/rebuildPatches.sh +++ b/rebuildPatches.sh @@ -30,6 +30,8 @@ function savePatches { target=$2 echo "Formatting patches for $what..." cd "$basedir/$target" + + rm -rf "$basedir/${what_name}-Patches/*.patch" git format-patch --no-stat -N -o "$basedir/${what_name}-Patches/" upstream/upstream >/dev/null cd "$basedir" git add -A "$basedir/${what_name}-Patches"