From ffb572ce9a16b808f2314da669dfa244d11fd29c Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 22 Apr 2017 15:32:06 +0100 Subject: [PATCH] Remove Ignore invalid Marker Icon ID's in maps Spigot has patched this issue inside MapIcon, meaning that we no longer need to maintain this patch; Spigots patch also fixes #668 in that it will verify the length of the array, as well as protect against a negative type value being fetched from the array. Only real change is that Spigots patch returns a MapIcon.Type.PLAYER, instead of the RED_MARKER as originally PR'd by Aikar. --- ...d-MetadataStoreBase.removeAll-Plugin.patch | 6 ++--- ...0033-Add-PlayerUseUnknownEntityEvent.patch | 6 ++--- ...ent-to-allow-plugins-to-handle-clien.patch | 6 ++--- .../0035-Arrow-pickup-rule-API.patch | 6 ++--- ...ityRegainHealthEvent-isFastRegen-API.patch | 6 ++--- Spigot-API-Patches/0037-LootTable-API.patch | 22 +++++++-------- .../0038-Add-EntityZapEvent.patch | 8 +++--- Spigot-API-Patches/0039-Misc-Utils.patch | 6 ++--- ...0-Allow-Reloading-of-Command-Aliases.patch | 4 +-- ...1-Add-source-to-PlayerExpChangeEvent.patch | 6 ++--- .../0042-Add-ProjectileCollideEvent.patch | 6 ++--- ...0043-Add-String-based-Action-Bar-API.patch | 4 +-- ...to-control-if-armour-stands-can-move.patch | 6 ++--- .../0045-IllegalPacketEvent.patch | 6 ++--- .../0002-Paper-config-files.patch | 20 +++++++------- Spigot-Server-Patches/0003-MC-Dev-fixes.patch | 14 +++++----- ...-explosions-processing-dead-entities.patch | 4 +-- ...Bound-Treasure-Maps-to-World-Border.patch} | 6 ++--- ...ore-invalid-Marker-Icon-ID-s-in-maps.patch | 27 ------------------- ...igurable-Cartographer-Treasure-Maps.patch} | 6 ++--- ... => 0184-Optimize-ItemStack.isEmpty.patch} | 4 +-- ...o-control-if-armour-stands-can-move.patch} | 6 ++--- ...-armor-stands-from-doing-entity-loo.patch} | 6 ++--- ...option-to-remove-invalid-statistics.patch} | 6 ++--- ...nt.patch => 0188-IllegalPacketEvent.patch} | 4 +-- ...9-Properly-fix-item-duplication-bug.patch} | 6 ++--- ...=> 0190-String-based-Action-Bar-API.patch} | 6 ++--- ... 0191-Activation-Range-Improvements.patch} | 16 +++++------ ...-API-s.patch => 0192-Firework-API-s.patch} | 10 +++---- ...ated-Build-Download-URL-to-Paper-CI.patch} | 4 +-- ... 0194-PlayerTeleportEndGatewayEvent.patch} | 4 +-- ...re-Improper-Anvil-Item-Name-Packets.patch} | 4 +-- ...low-31-instead-of-30-for-item-names.patch} | 4 +-- ... => 0197-ShulkerBox-Dupe-Prevention.patch} | 4 +-- ...ovide-E-TE-Chunk-count-stat-methods.patch} | 4 +-- ...h => 0199-Enforce-Sync-Player-Saves.patch} | 4 +-- ... => 0200-Enforce-Sync-Chunk-Unloads.patch} | 4 +-- ...low-entities-to-ride-themselves-572.patch} | 4 +-- ...atch => 0202-Fix-block-break-desync.patch} | 4 +-- ...ign-the-World-in-WorldGenStronghold.patch} | 4 +-- ...-fromBottle-flag-to-Experience-Orbs.patch} | 8 +++--- ...-Remove-the-Vanilla-Method-Profiler.patch} | 6 ++--- ...patch => 0206-Cap-Entity-Collisions.patch} | 8 +++--- ...ow-a-zero-max-height-in-BiomeJungle.patch} | 6 ++--- ...-CraftScheduler-Async-Task-Debugger.patch} | 4 +-- ...g.patch => 0209-Shame-on-you-Mojang.patch} | 4 +-- ...ore-aggressive-in-the-chunk-unload-.patch} | 4 +-- ...> 0211-Do-not-let-armorstands-drown.patch} | 6 ++--- ...-attempting-to-read-EMPTY-ItemStack.patch} | 4 +-- 49 files changed, 153 insertions(+), 180 deletions(-) rename Spigot-Server-Patches/{0183-Bound-Treasure-Maps-to-World-Border.patch => 0182-Bound-Treasure-Maps-to-World-Border.patch} (94%) delete mode 100644 Spigot-Server-Patches/0182-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch rename Spigot-Server-Patches/{0184-Configurable-Cartographer-Treasure-Maps.patch => 0183-Configurable-Cartographer-Treasure-Maps.patch} (94%) rename Spigot-Server-Patches/{0185-Optimize-ItemStack.isEmpty.patch => 0184-Optimize-ItemStack.isEmpty.patch} (92%) rename Spigot-Server-Patches/{0186-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0185-Add-API-methods-to-control-if-armour-stands-can-move.patch} (92%) rename Spigot-Server-Patches/{0187-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0186-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (91%) rename Spigot-Server-Patches/{0188-Add-option-to-remove-invalid-statistics.patch => 0187-Add-option-to-remove-invalid-statistics.patch} (95%) rename Spigot-Server-Patches/{0189-IllegalPacketEvent.patch => 0188-IllegalPacketEvent.patch} (97%) rename Spigot-Server-Patches/{0190-Properly-fix-item-duplication-bug.patch => 0189-Properly-fix-item-duplication-bug.patch} (91%) rename Spigot-Server-Patches/{0191-String-based-Action-Bar-API.patch => 0190-String-based-Action-Bar-API.patch} (95%) rename Spigot-Server-Patches/{0192-Activation-Range-Improvements.patch => 0191-Activation-Range-Improvements.patch} (95%) rename Spigot-Server-Patches/{0193-Firework-API-s.patch => 0192-Firework-API-s.patch} (96%) rename Spigot-Server-Patches/{0194-Change-Outdated-Build-Download-URL-to-Paper-CI.patch => 0193-Change-Outdated-Build-Download-URL-to-Paper-CI.patch} (91%) rename Spigot-Server-Patches/{0195-PlayerTeleportEndGatewayEvent.patch => 0194-PlayerTeleportEndGatewayEvent.patch} (93%) rename Spigot-Server-Patches/{0196-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch => 0195-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch} (92%) rename Spigot-Server-Patches/{0197-MC-112017-Allow-31-instead-of-30-for-item-names.patch => 0196-MC-112017-Allow-31-instead-of-30-for-item-names.patch} (91%) rename Spigot-Server-Patches/{0198-ShulkerBox-Dupe-Prevention.patch => 0197-ShulkerBox-Dupe-Prevention.patch} (90%) rename Spigot-Server-Patches/{0199-Provide-E-TE-Chunk-count-stat-methods.patch => 0198-Provide-E-TE-Chunk-count-stat-methods.patch} (94%) rename Spigot-Server-Patches/{0200-Enforce-Sync-Player-Saves.patch => 0199-Enforce-Sync-Player-Saves.patch} (91%) rename Spigot-Server-Patches/{0201-Enforce-Sync-Chunk-Unloads.patch => 0200-Enforce-Sync-Chunk-Unloads.patch} (92%) rename Spigot-Server-Patches/{0202-Don-t-allow-entities-to-ride-themselves-572.patch => 0201-Don-t-allow-entities-to-ride-themselves-572.patch} (88%) rename Spigot-Server-Patches/{0203-Fix-block-break-desync.patch => 0202-Fix-block-break-desync.patch} (89%) rename Spigot-Server-Patches/{0204-Assign-the-World-in-WorldGenStronghold.patch => 0203-Assign-the-World-in-WorldGenStronghold.patch} (88%) rename Spigot-Server-Patches/{0205-Add-fromBottle-flag-to-Experience-Orbs.patch => 0204-Add-fromBottle-flag-to-Experience-Orbs.patch} (94%) rename Spigot-Server-Patches/{0206-Remove-the-Vanilla-Method-Profiler.patch => 0205-Remove-the-Vanilla-Method-Profiler.patch} (96%) rename Spigot-Server-Patches/{0207-Cap-Entity-Collisions.patch => 0206-Cap-Entity-Collisions.patch} (93%) rename Spigot-Server-Patches/{0208-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch => 0207-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch} (93%) rename Spigot-Server-Patches/{0209-Remove-CraftScheduler-Async-Task-Debugger.patch => 0208-Remove-CraftScheduler-Async-Task-Debugger.patch} (96%) rename Spigot-Server-Patches/{0210-Shame-on-you-Mojang.patch => 0209-Shame-on-you-Mojang.patch} (95%) rename Spigot-Server-Patches/{0211-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0210-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (91%) rename Spigot-Server-Patches/{0212-Do-not-let-armorstands-drown.patch => 0211-Do-not-let-armorstands-drown.patch} (93%) rename Spigot-Server-Patches/{0213-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch => 0212-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch} (91%) diff --git a/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch index c19c3a63d4..29e4e6a524 100644 --- a/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch +++ b/Spigot-API-Patches/0032-Add-MetadataStoreBase.removeAll-Plugin.patch @@ -1,4 +1,4 @@ -From 804562f99c8f2bf6b5d9937d5a7816974c716502 Mon Sep 17 00:00:00 2001 +From 1a59075c01dbe0d53bd6fbfd94ccb1ef6a047a6a Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 16 Jul 2013 21:26:50 -0400 Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin) @@ -6,7 +6,7 @@ Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin) So that on reload, metadata will be cleared diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java -index 64c0f0a..6da6abd 100644 +index 64c0f0a7..6da6abd8 100644 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java @@ -125,6 +125,26 @@ public abstract class MetadataStoreBase { @@ -37,5 +37,5 @@ index 64c0f0a..6da6abd 100644 * unique data from the subject with a metadataKey. *

-- -2.9.2.windows.1 +2.12.2 diff --git a/Spigot-API-Patches/0033-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-API-Patches/0033-Add-PlayerUseUnknownEntityEvent.patch index fd275aad0d..c5991b4c04 100644 --- a/Spigot-API-Patches/0033-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-API-Patches/0033-Add-PlayerUseUnknownEntityEvent.patch @@ -1,4 +1,4 @@ -From b1f22f61664ce8f0ab822528909cce74b2e868db Mon Sep 17 00:00:00 2001 +From f63d0416b0cfb04ee48688f93db07c1c439e4c1c Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 05:08:36 -0400 Subject: [PATCH] Add PlayerUseUnknownEntityEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerUseUnknownEntityEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java new file mode 100644 -index 0000000..70eeaf5 +index 00000000..70eeaf5c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java @@ -0,0 +1,42 @@ @@ -53,5 +53,5 @@ index 0000000..70eeaf5 + } +} -- -2.9.3 +2.12.2 diff --git a/Spigot-API-Patches/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-API-Patches/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch index 71b8f2d3e8..880b57f1bd 100644 --- a/Spigot-API-Patches/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch +++ b/Spigot-API-Patches/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch @@ -1,4 +1,4 @@ -From d16e87afdfe9297199c8afd7e3929e734df8a1c4 Mon Sep 17 00:00:00 2001 +From 15b47a774783a9db24c742bb1fde6bb7c6404638 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 13 Apr 2016 20:20:18 -0700 Subject: [PATCH] Add handshake event to allow plugins to handle client @@ -7,7 +7,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java new file mode 100644 -index 0000000..e44d03a +index 00000000..e44d03a2 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java @@ -0,0 +1,211 @@ @@ -223,5 +223,5 @@ index 0000000..e44d03a + } +} -- -2.9.3 +2.12.2 diff --git a/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch b/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch index b27b92e86c..0f770d4f22 100644 --- a/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch +++ b/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch @@ -1,11 +1,11 @@ -From 17223e9ba60ecfb981e037bcc62018b428d71808 Mon Sep 17 00:00:00 2001 +From 5f3ad3c3d105730323ea950c36892c1c548f4437 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 4 Mar 2016 03:13:18 -0500 Subject: [PATCH] Arrow pickup rule API diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java -index 1ff0951..da4678d 100644 +index 1ff09518..da4678d0 100644 --- a/src/main/java/org/bukkit/entity/Arrow.java +++ b/src/main/java/org/bukkit/entity/Arrow.java @@ -72,6 +72,40 @@ public interface Arrow extends Projectile { @@ -50,5 +50,5 @@ index 1ff0951..da4678d 100644 { -- -2.9.3 +2.12.2 diff --git a/Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch index 0f7c262964..685f10efda 100644 --- a/Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-API-Patches/0036-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,11 +1,11 @@ -From b8f719bf3e633e806374b39efb137bdadcf487aa Mon Sep 17 00:00:00 2001 +From 7d6cfc99f472097c25b7b7a2ea575724d7edaa5c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 01:43:11 -0500 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java -index c7e9ba6..3ffc727 100644 +index c7e9ba6f..3ffc7273 100644 --- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java @@ -13,12 +13,31 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable @@ -41,5 +41,5 @@ index c7e9ba6..3ffc727 100644 /** * Gets the amount of regained health -- -2.9.3 +2.12.2 diff --git a/Spigot-API-Patches/0037-LootTable-API.patch b/Spigot-API-Patches/0037-LootTable-API.patch index 577722b660..ba8d33faea 100644 --- a/Spigot-API-Patches/0037-LootTable-API.patch +++ b/Spigot-API-Patches/0037-LootTable-API.patch @@ -1,4 +1,4 @@ -From c7f2d65d63f63175db11f06c1fac7c3c3bc5d246 Mon Sep 17 00:00:00 2001 +From bc7df9c5fea137834099549bf47b227df1813165 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 May 2016 15:19:49 -0400 Subject: [PATCH] LootTable API @@ -12,7 +12,7 @@ Provides methods to determine players looted state for an object diff --git a/src/main/java/com/destroystokyo/paper/loottable/Lootable.java b/src/main/java/com/destroystokyo/paper/loottable/Lootable.java new file mode 100644 -index 0000000..d962a0c +index 00000000..d962a0ce --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/Lootable.java @@ -0,0 +1,78 @@ @@ -96,7 +96,7 @@ index 0000000..d962a0c +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java new file mode 100644 -index 0000000..5e93e7e +index 00000000..5e93e7e3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java @@ -0,0 +1,12 @@ @@ -114,7 +114,7 @@ index 0000000..5e93e7e +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java new file mode 100644 -index 0000000..8bebf07 +index 00000000..8bebf070 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java @@ -0,0 +1,12 @@ @@ -132,7 +132,7 @@ index 0000000..8bebf07 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java new file mode 100644 -index 0000000..cde999e +index 00000000..cde999ef --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java @@ -0,0 +1,111 @@ @@ -249,7 +249,7 @@ index 0000000..cde999e +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java new file mode 100644 -index 0000000..2169493 +index 00000000..2169493d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java @@ -0,0 +1,41 @@ @@ -295,7 +295,7 @@ index 0000000..2169493 + } +} diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java -index ade09dd..368306d 100644 +index ade09ddd..368306d0 100644 --- a/src/main/java/org/bukkit/block/Chest.java +++ b/src/main/java/org/bukkit/block/Chest.java @@ -1,13 +1,14 @@ @@ -315,7 +315,7 @@ index ade09dd..368306d 100644 /** * Returns the chest's inventory. If this is a double chest, it returns diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java -index 39ee9b0..236ffa3 100644 +index 39ee9b04..236ffa32 100644 --- a/src/main/java/org/bukkit/block/Dispenser.java +++ b/src/main/java/org/bukkit/block/Dispenser.java @@ -1,13 +1,14 @@ @@ -335,7 +335,7 @@ index 39ee9b0..236ffa3 100644 /** * Gets the BlockProjectileSource object for this dispenser. diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java -index 8e5e3e8..c08a1a5 100644 +index 8e5e3e89..c08a1a50 100644 --- a/src/main/java/org/bukkit/block/Hopper.java +++ b/src/main/java/org/bukkit/block/Hopper.java @@ -1,9 +1,12 @@ @@ -353,7 +353,7 @@ index 8e5e3e8..c08a1a5 100644 + +} diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java -index 003cfb8..7b40df1 100644 +index 003cfb8a..7b40df14 100644 --- a/src/main/java/org/bukkit/block/ShulkerBox.java +++ b/src/main/java/org/bukkit/block/ShulkerBox.java @@ -1,5 +1,6 @@ @@ -373,5 +373,5 @@ index 003cfb8..7b40df1 100644 /** * Get the {@link DyeColor} corresponding to this ShulkerBox -- -2.9.3 +2.12.2 diff --git a/Spigot-API-Patches/0038-Add-EntityZapEvent.patch b/Spigot-API-Patches/0038-Add-EntityZapEvent.patch index b24ad9f0b8..5b0c5db221 100644 --- a/Spigot-API-Patches/0038-Add-EntityZapEvent.patch +++ b/Spigot-API-Patches/0038-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From c6760f719794bea15aefbc716b386ea7bc3a7af7 Mon Sep 17 00:00:00 2001 +From 2b3054eda2cfa7dd47f019fa1d1eda5537c73266 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:34 -0700 Subject: [PATCH] Add EntityZapEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityZapEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java new file mode 100644 -index 0000000..0da8944 +index 00000000..0da89441 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java @@ -0,0 +1,63 @@ @@ -74,7 +74,7 @@ index 0000000..0da8944 + } +} diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java -index aa80ebf..73844b8 100644 +index aa80ebf1..73844b8f 100644 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java @@ -1,5 +1,6 @@ @@ -119,5 +119,5 @@ index aa80ebf..73844b8 100644 + // Paper end } -- -2.9.3 +2.12.2 diff --git a/Spigot-API-Patches/0039-Misc-Utils.patch b/Spigot-API-Patches/0039-Misc-Utils.patch index 71fcb990a4..0c7b232611 100644 --- a/Spigot-API-Patches/0039-Misc-Utils.patch +++ b/Spigot-API-Patches/0039-Misc-Utils.patch @@ -1,4 +1,4 @@ -From 80f595a006d469d8fe65d1324ee05d8b498a1ce5 Mon Sep 17 00:00:00 2001 +From a5a7153cde37ce84714514cd647693113fdea266 Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 12:53:43 -0500 Subject: [PATCH] Misc Utils @@ -6,7 +6,7 @@ Subject: [PATCH] Misc Utils diff --git a/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java new file mode 100644 -index 0000000..d60ecbb +index 00000000..d60ecbb1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java @@ -0,0 +1,31 @@ @@ -42,5 +42,5 @@ index 0000000..d60ecbb + } +} -- -2.9.3 +2.12.2 diff --git a/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch index f2fbfe3276..642909463a 100644 --- a/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From 9b40254808daac69e7657b3c20e4316de8cfac6b Mon Sep 17 00:00:00 2001 +From 5075ebcd06026e2d2e713d47e86d4ad0ddbcbc2b Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:16:39 -0500 Subject: [PATCH] Allow Reloading of Command Aliases @@ -94,5 +94,5 @@ index 040509c1..0069bcc0 100644 confirmed = true; } else { -- -2.11.0 +2.12.2 diff --git a/Spigot-API-Patches/0041-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-API-Patches/0041-Add-source-to-PlayerExpChangeEvent.patch index e8f929bcd0..90965561c7 100644 --- a/Spigot-API-Patches/0041-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-API-Patches/0041-Add-source-to-PlayerExpChangeEvent.patch @@ -1,11 +1,11 @@ -From 381bcc72af916fa0e30ba7c0701484e647c640dc Mon Sep 17 00:00:00 2001 +From 6b4ec223ad07f5f8c5392bf724acfa4b6765c1de Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:47:08 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent diff --git a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java -index f37491d..3088255 100644 +index f37491d7..30882559 100644 --- a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java @@ -1,21 +1,43 @@ @@ -53,5 +53,5 @@ index f37491d..3088255 100644 * * @return The amount of experience -- -2.9.3 +2.12.2 diff --git a/Spigot-API-Patches/0042-Add-ProjectileCollideEvent.patch b/Spigot-API-Patches/0042-Add-ProjectileCollideEvent.patch index 12d802ee1f..128c7e3040 100644 --- a/Spigot-API-Patches/0042-Add-ProjectileCollideEvent.patch +++ b/Spigot-API-Patches/0042-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From 5fba5a4e75e64bfb2b2b73ff39cbe55dd12ee1b9 Mon Sep 17 00:00:00 2001 +From 8a1678e60bc1ddc67b3b8cacbb6761daf1a97fc6 Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add ProjectileCollideEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java new file mode 100644 -index 0000000..f42e985 +index 00000000..f42e9851 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java @@ -0,0 +1,62 @@ @@ -73,5 +73,5 @@ index 0000000..f42e985 + } +} -- -2.9.3 +2.12.2 diff --git a/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch index bcd43a3b82..17a6adb981 100644 --- a/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch +++ b/Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch @@ -1,4 +1,4 @@ -From d6bb5c03434b922e1743da728186da22bc0786fe Mon Sep 17 00:00:00 2001 +From 309d69927547f1e1da781153bd9f0b851facbe6a Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:55:55 -0500 Subject: [PATCH] Add String based Action Bar API @@ -73,5 +73,5 @@ index a0b95550..2c166a8c 100644 throw new UnsupportedOperationException("Not supported yet."); } -- -2.12.1.windows.1 +2.12.2 diff --git a/Spigot-API-Patches/0044-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-API-Patches/0044-Add-API-methods-to-control-if-armour-stands-can-move.patch index e969cb8204..9aac53ef0f 100644 --- a/Spigot-API-Patches/0044-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-API-Patches/0044-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,11 +1,11 @@ -From 78d6bbb91f72258376e3518b8f9f19eb3b91adee Mon Sep 17 00:00:00 2001 +From 85ee642fb344d3aa7bb5a256cd1edcb1ab6a673b Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:47:25 -0600 Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index b4f0451..099da6c 100644 +index b4f04517..099da6ce 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -258,4 +258,22 @@ public interface ArmorStand extends LivingEntity { @@ -32,5 +32,5 @@ index b4f0451..099da6c 100644 + // Paper end } -- -2.9.3 +2.12.2 diff --git a/Spigot-API-Patches/0045-IllegalPacketEvent.patch b/Spigot-API-Patches/0045-IllegalPacketEvent.patch index 23fe50ad47..31ddef04d9 100644 --- a/Spigot-API-Patches/0045-IllegalPacketEvent.patch +++ b/Spigot-API-Patches/0045-IllegalPacketEvent.patch @@ -1,4 +1,4 @@ -From bad77ff8bbca1adeb51a99369b3aaaaf5046b7ee Mon Sep 17 00:00:00 2001 +From 89165c8a70cce041d5daead1b9aadc8f214798a9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 4 Dec 2016 01:19:14 -0500 Subject: [PATCH] IllegalPacketEvent @@ -9,7 +9,7 @@ Lets plugins change the kick message and if it should kick or not. diff --git a/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java new file mode 100644 -index 0000000..e11f74f +index 00000000..e11f74fc --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java @@ -0,0 +1,63 @@ @@ -77,5 +77,5 @@ index 0000000..e11f74f + } +} -- -2.9.3 +2.12.2 diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch index 731a740cbf..8952d74d11 100644 --- a/Spigot-Server-Patches/0002-Paper-config-files.patch +++ b/Spigot-Server-Patches/0002-Paper-config-files.patch @@ -1,4 +1,4 @@ -From 6c3465d75b4745ffa054704f456e983a86564e4a Mon Sep 17 00:00:00 2001 +From 592ca37122a5eb5a53cc83cd94dcd1a7c36ebaf8 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 21:02:09 -0600 Subject: [PATCH] Paper config files @@ -6,7 +6,7 @@ Subject: [PATCH] Paper config files diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java new file mode 100644 -index 000000000..13d5a8ef3 +index 00000000..2096d3f9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -0,0 +1,49 @@ @@ -61,7 +61,7 @@ index 000000000..13d5a8ef3 +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java new file mode 100644 -index 000000000..328ff012b +index 00000000..328ff012 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -0,0 +1,173 @@ @@ -240,7 +240,7 @@ index 000000000..328ff012b +} diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java new file mode 100644 -index 000000000..621bf7051 +index 00000000..621bf705 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -0,0 +1,66 @@ @@ -311,7 +311,7 @@ index 000000000..621bf7051 + } +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 31756b80d..cb83e4f56 100644 +index 31756b80..cb83e4f5 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -183,6 +183,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -326,7 +326,7 @@ index 31756b80d..cb83e4f56 100644 DedicatedServer.LOGGER.info("Generating keypair"); this.a(MinecraftEncryption.b()); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index eab11685c..758962e67 100644 +index eab11685..758962e6 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -125,6 +125,8 @@ public abstract class World implements IBlockAccess { @@ -347,7 +347,7 @@ index eab11685c..758962e67 100644 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 312260764..791383fb3 100644 +index b7e1f182..587d23df 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -697,6 +697,7 @@ public final class CraftServer implements Server { @@ -374,7 +374,7 @@ index 312260764..791383fb3 100644 overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index ee8ec5a68..4399faf69 100644 +index ee8ec5a6..4399faf6 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -126,6 +126,14 @@ public class Main { @@ -393,7 +393,7 @@ index ee8ec5a68..4399faf69 100644 }; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 01e73eb89..0b66f5e35 100644 +index 01e73eb8..0b66f5e3 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -39,31 +39,31 @@ public class SpigotWorldConfig @@ -434,5 +434,5 @@ index 01e73eb89..0b66f5e35 100644 config.addDefault( "world-settings.default." + path, def ); return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) ); -- -2.12.0.windows.1 +2.12.2 diff --git a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch index 74c5e9cac8..db54ee31ac 100644 --- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch +++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch @@ -1,11 +1,11 @@ -From ac03240e79862b55067a1317bea4ab1a14ab9a95 Mon Sep 17 00:00:00 2001 +From d53c24fef5ec8a7ba7a0681d0b7361d10eba2d40 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 19:36:20 -0400 Subject: [PATCH] MC Dev fixes diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java -index f02fc60..d60e755 100644 +index f02fc607..d60e7550 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -89,7 +89,7 @@ public class BaseBlockPosition implements Comparable { @@ -18,7 +18,7 @@ index f02fc60..d60e755 100644 } } diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java -index e62df5c..62a338e 100644 +index e62df5c1..62a338e9 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java @@ -49,7 +49,7 @@ public abstract class BiomeBase { @@ -31,7 +31,7 @@ index e62df5c..62a338e 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java -index 71524f2..288c52c 100644 +index 71524f2c..288c52c5 100644 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java @@ -29,7 +29,7 @@ public class BlockStateEnum & INamable> extends BlockState @@ -44,7 +44,7 @@ index 71524f2..288c52c 100644 } diff --git a/src/main/java/net/minecraft/server/CommandAbstract.java b/src/main/java/net/minecraft/server/CommandAbstract.java -index fe74068..b669884 100644 +index fe74068e..b669884d 100644 --- a/src/main/java/net/minecraft/server/CommandAbstract.java +++ b/src/main/java/net/minecraft/server/CommandAbstract.java @@ -223,7 +223,7 @@ public abstract class CommandAbstract implements ICommand { @@ -84,7 +84,7 @@ index fe74068..b669884 100644 } diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java -index f5bcbdb..3190cad 100644 +index f5bcbdbe..3190cadf 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java @@ -20,7 +20,7 @@ public class ItemFactoryTest extends AbstractTestingBase { @@ -97,5 +97,5 @@ index f5bcbdb..3190cad 100644 for (ZipEntry clazzEntry; (clazzEntry = nmsZipStream.getNextEntry()) != null; ) { final String entryName = clazzEntry.getName(); -- -2.10.2 +2.12.2 diff --git a/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch index 88e5b7820d..cab915b3af 100644 --- a/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch +++ b/Spigot-Server-Patches/0030-Fix-lag-from-explosions-processing-dead-entities.patch @@ -1,11 +1,11 @@ -From 6da14448ed853c7b336d8ff6ce0952ebf5b9af2a Mon Sep 17 00:00:00 2001 +From 65e62f2e8061d17c5703124546f56bb1b1b7fb64 Mon Sep 17 00:00:00 2001 From: Iceee Date: Wed, 2 Mar 2016 01:39:52 -0600 Subject: [PATCH] Fix lag from explosions processing dead entities diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index 904bee8b5..4e05bcdfa 100644 +index 904bee8b..4e05bcdf 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -104,7 +104,14 @@ public class Explosion { diff --git a/Spigot-Server-Patches/0183-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0182-Bound-Treasure-Maps-to-World-Border.patch similarity index 94% rename from Spigot-Server-Patches/0183-Bound-Treasure-Maps-to-World-Border.patch rename to Spigot-Server-Patches/0182-Bound-Treasure-Maps-to-World-Border.patch index f0a58d2b92..d59a0b0e1b 100644 --- a/Spigot-Server-Patches/0183-Bound-Treasure-Maps-to-World-Border.patch +++ b/Spigot-Server-Patches/0182-Bound-Treasure-Maps-to-World-Border.patch @@ -1,4 +1,4 @@ -From 7ec221ebfaf5d25732b2ed77759dd5d0ff10b9f1 Mon Sep 17 00:00:00 2001 +From 7318fd9b00548085fc7ed532a1541aa11916fd94 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:15:11 -0500 Subject: [PATCH] Bound Treasure Maps to World Border @@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable one is in border that would of been missed. diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java -index 9c1605b14..77236760f 100644 +index 9c1605b1..77236760 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -233,6 +233,9 @@ public abstract class StructureGenerator extends WorldGenBase { @@ -25,7 +25,7 @@ index 9c1605b14..77236760f 100644 if (!flag1 || !world.b(l2, i3)) { return new BlockPosition((l2 << 4) + 8, 64, (i3 << 4) + 8); diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java -index 632eb1c9d..1bb172bbf 100644 +index 632eb1c9..1bb172bb 100644 --- a/src/main/java/net/minecraft/server/WorldBorder.java +++ b/src/main/java/net/minecraft/server/WorldBorder.java @@ -33,6 +33,18 @@ public class WorldBorder { diff --git a/Spigot-Server-Patches/0182-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch b/Spigot-Server-Patches/0182-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch deleted file mode 100644 index b1dcaae8c9..0000000000 --- a/Spigot-Server-Patches/0182-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7a212ee9a8837cc5f3aca50aa2d80b24a6865d1e Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Mon, 19 Dec 2016 23:38:57 -0500 -Subject: [PATCH] Ignore invalid Marker Icon ID's in maps - -Replace with the red marker. Should of only happened by creative abuse. - -diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java -index dbe6a80f2..dfd8e4d84 100644 ---- a/src/main/java/net/minecraft/server/WorldMap.java -+++ b/src/main/java/net/minecraft/server/WorldMap.java -@@ -194,7 +194,11 @@ public class WorldMap extends PersistentBase { - // Spigot - start - UUID uuid = UUID.nameUUIDFromBytes(nbttagcompound.getString("id").getBytes(Charsets.US_ASCII)); - if (!this.decorations.containsKey(uuid)) { -- this.a(MapIcon.Type.a(nbttagcompound.getByte("type")), entityhuman.world, uuid, nbttagcompound.getDouble("x"), nbttagcompound.getDouble("z"), nbttagcompound.getDouble("rot")); -+ // Paper start - protect against bad map icon indexes -+ byte iconId = nbttagcompound.getByte("type"); -+ MapIcon.Type[] values = MapIcon.Type.values(); -+ this.a(values.length > iconId ? values[iconId] : values[2], entityhuman.world, uuid, nbttagcompound.getDouble("x"), nbttagcompound.getDouble("z"), nbttagcompound.getDouble("rot")); -+ // Paper end - // Spigot - end - } - } --- -2.12.2 - diff --git a/Spigot-Server-Patches/0184-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0183-Configurable-Cartographer-Treasure-Maps.patch similarity index 94% rename from Spigot-Server-Patches/0184-Configurable-Cartographer-Treasure-Maps.patch rename to Spigot-Server-Patches/0183-Configurable-Cartographer-Treasure-Maps.patch index 5aae616711..35f1b75919 100644 --- a/Spigot-Server-Patches/0184-Configurable-Cartographer-Treasure-Maps.patch +++ b/Spigot-Server-Patches/0183-Configurable-Cartographer-Treasure-Maps.patch @@ -1,4 +1,4 @@ -From 5e25f419de976f60fc7e4c1362c3d18a53890bef Mon Sep 17 00:00:00 2001 +From 037a3547d5daa2d36dc0bd7f3dc1cf6958be8bed Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:26:27 -0500 Subject: [PATCH] Configurable Cartographer Treasure Maps @@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's which are limited in quantity. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index dcf64efcc..bf2916802 100644 +index dcf64efc..bf291680 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -393,4 +393,14 @@ public class PaperWorldConfig { @@ -28,7 +28,7 @@ index dcf64efcc..bf2916802 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 4ad75468c..ac6e2a9aa 100644 +index 4ad75468..ac6e2a9a 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -761,7 +761,8 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { diff --git a/Spigot-Server-Patches/0185-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0184-Optimize-ItemStack.isEmpty.patch similarity index 92% rename from Spigot-Server-Patches/0185-Optimize-ItemStack.isEmpty.patch rename to Spigot-Server-Patches/0184-Optimize-ItemStack.isEmpty.patch index 859a7ffeba..466e443926 100644 --- a/Spigot-Server-Patches/0185-Optimize-ItemStack.isEmpty.patch +++ b/Spigot-Server-Patches/0184-Optimize-ItemStack.isEmpty.patch @@ -1,4 +1,4 @@ -From 853b37f21ca5ee4dcbd97bd2521e0ae9082f8ab3 Mon Sep 17 00:00:00 2001 +From 2f31a8392b51b3118e251416709c02fd8251bc05 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Dec 2016 03:48:29 -0500 Subject: [PATCH] Optimize ItemStack.isEmpty() @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty() Remove hashMap lookup every check, simplify code to remove ternary diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 911bd879a..45ebd3f61 100644 +index 911bd879..45ebd3f6 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -120,9 +120,15 @@ public final class ItemStack { diff --git a/Spigot-Server-Patches/0186-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0185-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 92% rename from Spigot-Server-Patches/0186-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to Spigot-Server-Patches/0185-Add-API-methods-to-control-if-armour-stands-can-move.patch index af981c79d6..c596123575 100644 --- a/Spigot-Server-Patches/0186-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-Server-Patches/0185-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,11 +1,11 @@ -From 646a6aff23796620fa4f75fb9a93d5537230d738 Mon Sep 17 00:00:00 2001 +From 97ba683a96e7d807faa7400a8acf3435bdd7f2a3 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:47:25 -0600 Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 96bb11005..7738ca385 100644 +index 96bb1100..7738ca38 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -50,6 +50,7 @@ public class EntityArmorStand extends EntityLiving { @@ -31,7 +31,7 @@ index 96bb11005..7738ca385 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index 2b66a08ad..8a06cb165 100644 +index 2b66a08a..8a06cb16 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -211,4 +211,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { diff --git a/Spigot-Server-Patches/0187-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0186-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 91% rename from Spigot-Server-Patches/0187-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to Spigot-Server-Patches/0186-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index 7e7c7c5987..adf1425488 100644 --- a/Spigot-Server-Patches/0187-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/Spigot-Server-Patches/0186-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -1,11 +1,11 @@ -From d858ceb94345c3486318007140f3da54c5f6949f Mon Sep 17 00:00:00 2001 +From 153c50aca4dd903d388c955d0e94f48a9678dc55 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:52:04 -0600 Subject: [PATCH] Option to prevent armor stands from doing entity lookups diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index bf2916802..61efcc479 100644 +index bf291680..61efcc47 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -403,4 +403,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index bf2916802..61efcc479 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 7af76e14c..2028cf81e 100644 +index 7af76e14..2028cf81 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1331,6 +1331,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0188-Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/0187-Add-option-to-remove-invalid-statistics.patch similarity index 95% rename from Spigot-Server-Patches/0188-Add-option-to-remove-invalid-statistics.patch rename to Spigot-Server-Patches/0187-Add-option-to-remove-invalid-statistics.patch index 495c8852ec..11ba7eca5c 100644 --- a/Spigot-Server-Patches/0188-Add-option-to-remove-invalid-statistics.patch +++ b/Spigot-Server-Patches/0187-Add-option-to-remove-invalid-statistics.patch @@ -1,11 +1,11 @@ -From e9c26ebbca617b1eb4856800b106a7a708e8bffc Mon Sep 17 00:00:00 2001 +From 1266f16b4aa8a1dc81aa3fcbbdabea44fc54ab1d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 20 Dec 2016 23:09:21 -0600 Subject: [PATCH] Add option to remove invalid statistics diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 009bf0c8b..a901cd85c 100644 +index 009bf0c8..a901cd85 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -261,4 +261,13 @@ public class PaperConfig { @@ -23,7 +23,7 @@ index 009bf0c8b..a901cd85c 100644 + } } diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java -index 99466dbde..d1bee0257 100644 +index 99466dbd..d1bee025 100644 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java @@ -104,6 +104,7 @@ public class ServerStatisticManager extends StatisticManager { diff --git a/Spigot-Server-Patches/0189-IllegalPacketEvent.patch b/Spigot-Server-Patches/0188-IllegalPacketEvent.patch similarity index 97% rename from Spigot-Server-Patches/0189-IllegalPacketEvent.patch rename to Spigot-Server-Patches/0188-IllegalPacketEvent.patch index fe258a7ca6..9749502ab1 100644 --- a/Spigot-Server-Patches/0189-IllegalPacketEvent.patch +++ b/Spigot-Server-Patches/0188-IllegalPacketEvent.patch @@ -1,4 +1,4 @@ -From 725bc47a62a7a31ea5246a767641048e0ac7d71f Mon Sep 17 00:00:00 2001 +From 296392390487981d5c0f092afa3b1cb69cd3e90c Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 23 Jun 2016 23:33:57 -0400 Subject: [PATCH] IllegalPacketEvent @@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent Fired for invalid data from players that represents hacking attempts diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 51d27351d..437575003 100644 +index 51d27351..43757500 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory; diff --git a/Spigot-Server-Patches/0190-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0189-Properly-fix-item-duplication-bug.patch similarity index 91% rename from Spigot-Server-Patches/0190-Properly-fix-item-duplication-bug.patch rename to Spigot-Server-Patches/0189-Properly-fix-item-duplication-bug.patch index b4613323b2..5be8e4a35b 100644 --- a/Spigot-Server-Patches/0190-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0189-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From 692ea609955c5f4e1c0ec7ca7eaf6ee2e37f85c7 Mon Sep 17 00:00:00 2001 +From 7fa342a5b6c89bbc3be05d7b6b87693d2d78c64c Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Tue, 27 Dec 2016 01:57:57 +0000 Subject: [PATCH] Properly fix item duplication bug @@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug Credit to prplz for figuring out the real issue diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 56ce2554d..a5c5bd4be 100644 +index 56ce2554..a5c5bd4b 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1345,7 +1345,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -19,7 +19,7 @@ index 56ce2554d..a5c5bd4be 100644 public void reset() { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 437575003..7c2d43ac2 100644 +index 43757500..7c2d43ac 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2565,6 +2565,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0191-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0190-String-based-Action-Bar-API.patch similarity index 95% rename from Spigot-Server-Patches/0191-String-based-Action-Bar-API.patch rename to Spigot-Server-Patches/0190-String-based-Action-Bar-API.patch index 381bbb29f1..cdea69da14 100644 --- a/Spigot-Server-Patches/0191-String-based-Action-Bar-API.patch +++ b/Spigot-Server-Patches/0190-String-based-Action-Bar-API.patch @@ -1,11 +1,11 @@ -From e3e0fdeda8bebc5968613647f0af4b064d5713b1 Mon Sep 17 00:00:00 2001 +From cc90ff49f039ed8a4f6029ab012ebb54650af0e0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Dec 2016 15:02:42 -0500 Subject: [PATCH] String based Action Bar API diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 1159eea1a..38359517c 100644 +index 1159eea1..38359517 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -1,10 +1,13 @@ @@ -62,7 +62,7 @@ index 1159eea1a..38359517c 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 233903b5f..a57034471 100644 +index 233903b5..a5703447 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -165,6 +165,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0192-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0191-Activation-Range-Improvements.patch similarity index 95% rename from Spigot-Server-Patches/0192-Activation-Range-Improvements.patch rename to Spigot-Server-Patches/0191-Activation-Range-Improvements.patch index 1ff5e06853..a8c8770983 100644 --- a/Spigot-Server-Patches/0192-Activation-Range-Improvements.patch +++ b/Spigot-Server-Patches/0191-Activation-Range-Improvements.patch @@ -1,4 +1,4 @@ -From 171b99c956c4ae9aa6a3ce852561388db8f4cf72 Mon Sep 17 00:00:00 2001 +From c392e42cebf61a9533e604a387aa1a7fd702c613 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Dec 2016 22:38:06 -0500 Subject: [PATCH] Activation Range Improvements @@ -6,7 +6,7 @@ Subject: [PATCH] Activation Range Improvements Fixes and adds new Immunities to improve gameplay behavior diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java -index fdfe5b9ed..ce3907438 100644 +index fdfe5b9e..ce390743 100644 --- a/src/main/java/net/minecraft/server/EntityCreature.java +++ b/src/main/java/net/minecraft/server/EntityCreature.java @@ -10,6 +10,7 @@ public abstract class EntityCreature extends EntityInsentient { @@ -18,7 +18,7 @@ index fdfe5b9ed..ce3907438 100644 private float b; private float c; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index b8ac99e5d..7242da9cc 100644 +index b8ac99e5..7242da9c 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -73,7 +73,7 @@ public abstract class EntityLiving extends Entity { @@ -31,7 +31,7 @@ index b8ac99e5d..7242da9cc 100644 protected int ticksFarFromPlayer; protected float aW; diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java -index 13ae7a030..7e3aa6ee6 100644 +index 13ae7a03..7e3aa6ee 100644 --- a/src/main/java/net/minecraft/server/EntityLlama.java +++ b/src/main/java/net/minecraft/server/EntityLlama.java @@ -363,7 +363,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn @@ -44,7 +44,7 @@ index 13ae7a030..7e3aa6ee6 100644 } diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index ac6e2a9aa..e6c190d43 100644 +index ac6e2a9a..e6c190d4 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -20,7 +20,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { @@ -57,7 +57,7 @@ index ac6e2a9aa..e6c190d43 100644 Village village; private EntityHuman tradingPlayer; diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java -index 83d9c43f3..1cb6652c2 100644 +index 83d9c43f..1cb6652c 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java @@ -18,7 +18,10 @@ public abstract class PathfinderGoal { @@ -73,7 +73,7 @@ index 83d9c43f3..1cb6652c2 100644 public void e() {} diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java -index e5b5e9887..e3781f3a8 100644 +index e5b5e988..e3781f3a 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java @@ -2,12 +2,21 @@ package net.minecraft.server; @@ -110,7 +110,7 @@ index e5b5e9887..e3781f3a8 100644 } } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index c8a6ff3d4..428912cbc 100644 +index c8a6ff3d..428912cb 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -20,6 +20,7 @@ import net.minecraft.server.EntityFireball; diff --git a/Spigot-Server-Patches/0193-Firework-API-s.patch b/Spigot-Server-Patches/0192-Firework-API-s.patch similarity index 96% rename from Spigot-Server-Patches/0193-Firework-API-s.patch rename to Spigot-Server-Patches/0192-Firework-API-s.patch index 6f1e23b92a..c31386a122 100644 --- a/Spigot-Server-Patches/0193-Firework-API-s.patch +++ b/Spigot-Server-Patches/0192-Firework-API-s.patch @@ -1,11 +1,11 @@ -From cbae9aff5739ca9a45c3831f54abde0d88e70286 Mon Sep 17 00:00:00 2001 +From efd9d25626205508f7eebb859fbbf11dd67f67d1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 28 Dec 2016 01:18:33 -0500 Subject: [PATCH] Firework API's diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java -index 572f4dead..f9cf382b2 100644 +index 572f4dea..f9cf382b 100644 --- a/src/main/java/net/minecraft/server/EntityFireworks.java +++ b/src/main/java/net/minecraft/server/EntityFireworks.java @@ -2,6 +2,8 @@ package net.minecraft.server; @@ -53,7 +53,7 @@ index 572f4dead..f9cf382b2 100644 public boolean aV() { diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java -index 4fc36d243..5cd68bfaf 100644 +index 4fc36d24..5cd68bfa 100644 --- a/src/main/java/net/minecraft/server/ItemFireworks.java +++ b/src/main/java/net/minecraft/server/ItemFireworks.java @@ -9,6 +9,7 @@ public class ItemFireworks extends Item { @@ -73,7 +73,7 @@ index 4fc36d243..5cd68bfaf 100644 if (!entityhuman.abilities.canInstantlyBuild) { itemstack.subtract(1); diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java -index 2a2f53c82..266741fcd 100644 +index 2a2f53c8..266741fc 100644 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java @@ -103,7 +103,7 @@ public class NBTTagCompound extends NBTBase { @@ -86,7 +86,7 @@ index 2a2f53c82..266741fcd 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java -index 99746b3c2..d4fbe31d6 100644 +index 99746b3c..d4fbe31d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java @@ -1,6 +1,7 @@ diff --git a/Spigot-Server-Patches/0194-Change-Outdated-Build-Download-URL-to-Paper-CI.patch b/Spigot-Server-Patches/0193-Change-Outdated-Build-Download-URL-to-Paper-CI.patch similarity index 91% rename from Spigot-Server-Patches/0194-Change-Outdated-Build-Download-URL-to-Paper-CI.patch rename to Spigot-Server-Patches/0193-Change-Outdated-Build-Download-URL-to-Paper-CI.patch index f802c0a493..1efdc27ed9 100644 --- a/Spigot-Server-Patches/0194-Change-Outdated-Build-Download-URL-to-Paper-CI.patch +++ b/Spigot-Server-Patches/0193-Change-Outdated-Build-Download-URL-to-Paper-CI.patch @@ -1,11 +1,11 @@ -From dc1da7f09f8739925aaf3b3854e1be1077d441af Mon Sep 17 00:00:00 2001 +From aa61f3fe07ad74f26194edff03cd511a0ac490f1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 29 Dec 2016 00:56:51 -0500 Subject: [PATCH] Change Outdated Build Download URL to Paper CI diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 59d4e2e6f..e4ec213e4 100644 +index 59d4e2e6..e4ec213e 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -200,7 +200,7 @@ public class Main { diff --git a/Spigot-Server-Patches/0195-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0194-PlayerTeleportEndGatewayEvent.patch similarity index 93% rename from Spigot-Server-Patches/0195-PlayerTeleportEndGatewayEvent.patch rename to Spigot-Server-Patches/0194-PlayerTeleportEndGatewayEvent.patch index 7fddba7151..87f797c189 100644 --- a/Spigot-Server-Patches/0195-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0194-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 3152003830f317031c01e7ef4cbff6993167271f Mon Sep 17 00:00:00 2001 +From 9005f191ef06a9e704811f05166da220da96bc00 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 31 Dec 2016 21:44:50 -0500 Subject: [PATCH] PlayerTeleportEndGatewayEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent Allows you to access the Gateway being used in a teleport event diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java -index 065d0bbfc..ea8992d72 100644 +index 065d0bbf..ea8992d7 100644 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java @@ -124,7 +124,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick diff --git a/Spigot-Server-Patches/0196-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch b/Spigot-Server-Patches/0195-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch similarity index 92% rename from Spigot-Server-Patches/0196-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch rename to Spigot-Server-Patches/0195-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch index 0101bbbbb6..b65a02a5d6 100644 --- a/Spigot-Server-Patches/0196-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch +++ b/Spigot-Server-Patches/0195-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch @@ -1,4 +1,4 @@ -From f41f9d51855c2523df6f131f9a1025458e064ca6 Mon Sep 17 00:00:00 2001 +From c36f506b1200efce56cc66a11e2930dcc4803de1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 2 Jan 2017 02:07:24 -0500 Subject: [PATCH] MC-111699: Ignore Improper Anvil Item Name Packets @@ -11,7 +11,7 @@ This breaks the ability to rename more than 1 item at a time. See: https://bugs.mojang.com/browse/MC-111699 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 7c2d43ac2..cbe5d36d0 100644 +index 7c2d43ac..cbe5d36d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2449,7 +2449,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0197-MC-112017-Allow-31-instead-of-30-for-item-names.patch b/Spigot-Server-Patches/0196-MC-112017-Allow-31-instead-of-30-for-item-names.patch similarity index 91% rename from Spigot-Server-Patches/0197-MC-112017-Allow-31-instead-of-30-for-item-names.patch rename to Spigot-Server-Patches/0196-MC-112017-Allow-31-instead-of-30-for-item-names.patch index 62c9967628..4e9bf31581 100644 --- a/Spigot-Server-Patches/0197-MC-112017-Allow-31-instead-of-30-for-item-names.patch +++ b/Spigot-Server-Patches/0196-MC-112017-Allow-31-instead-of-30-for-item-names.patch @@ -1,11 +1,11 @@ -From c821a74573a8283b5ba28f8f09da5f539451b640 Mon Sep 17 00:00:00 2001 +From 8cbb563ef82d04f6723b7d3cfc4363da1d833249 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 2 Jan 2017 02:43:22 -0500 Subject: [PATCH] MC-112017: Allow 31 instead of 30 for item names diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index cbe5d36d0..70af4ebbb 100644 +index cbe5d36d..70af4ebb 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2448,7 +2448,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0198-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0197-ShulkerBox-Dupe-Prevention.patch similarity index 90% rename from Spigot-Server-Patches/0198-ShulkerBox-Dupe-Prevention.patch rename to Spigot-Server-Patches/0197-ShulkerBox-Dupe-Prevention.patch index bd0dcc878b..851a3814b6 100644 --- a/Spigot-Server-Patches/0198-ShulkerBox-Dupe-Prevention.patch +++ b/Spigot-Server-Patches/0197-ShulkerBox-Dupe-Prevention.patch @@ -1,4 +1,4 @@ -From 9e12095b8bd3a30cda0f159c8008193c1d29ec6d Mon Sep 17 00:00:00 2001 +From bbf93cd5704f8d700fcb1154b75085f7406c1a53 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 2 Jan 2017 16:32:56 -0500 Subject: [PATCH] ShulkerBox Dupe Prevention @@ -7,7 +7,7 @@ This ensures that Shulker Boxes can never drop their contents twice, and that the inventory is cleared incase it some how also got saved to the world. diff --git a/src/main/java/net/minecraft/server/BlockShulkerBox.java b/src/main/java/net/minecraft/server/BlockShulkerBox.java -index fcb1a6c66..12fb81635 100644 +index fcb1a6c6..12fb8163 100644 --- a/src/main/java/net/minecraft/server/BlockShulkerBox.java +++ b/src/main/java/net/minecraft/server/BlockShulkerBox.java @@ -109,6 +109,7 @@ public class BlockShulkerBox extends BlockTileEntity { diff --git a/Spigot-Server-Patches/0199-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0198-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 94% rename from Spigot-Server-Patches/0199-Provide-E-TE-Chunk-count-stat-methods.patch rename to Spigot-Server-Patches/0198-Provide-E-TE-Chunk-count-stat-methods.patch index e25f4a5422..9508b74200 100644 --- a/Spigot-Server-Patches/0199-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-Server-Patches/0198-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From 10b5bace2998a5679912d098488f9662879e4cd6 Mon Sep 17 00:00:00 2001 +From df856ad0cf3f52de980e71a1e0c7288beff54334 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:24:46 -0500 Subject: [PATCH] Provide E/TE/Chunk count stat methods @@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 3f8859a1f..b42074706 100644 +index 3f8859a1..b4207470 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -78,6 +78,29 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0200-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0199-Enforce-Sync-Player-Saves.patch similarity index 91% rename from Spigot-Server-Patches/0200-Enforce-Sync-Player-Saves.patch rename to Spigot-Server-Patches/0199-Enforce-Sync-Player-Saves.patch index 78d49f15bc..c32825fe85 100644 --- a/Spigot-Server-Patches/0200-Enforce-Sync-Player-Saves.patch +++ b/Spigot-Server-Patches/0199-Enforce-Sync-Player-Saves.patch @@ -1,4 +1,4 @@ -From 74cd9a5fe5f7233473c7270ec3ab99c228204628 Mon Sep 17 00:00:00 2001 +From 92c63591e1ef7367804389d182d09755a26693c5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:41:58 -0500 Subject: [PATCH] Enforce Sync Player Saves @@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 185b5929f..91a45a755 100644 +index 185b5929..91a45a75 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1213,6 +1213,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0201-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0200-Enforce-Sync-Chunk-Unloads.patch similarity index 92% rename from Spigot-Server-Patches/0201-Enforce-Sync-Chunk-Unloads.patch rename to Spigot-Server-Patches/0200-Enforce-Sync-Chunk-Unloads.patch index 784459bf89..62d8f26a3d 100644 --- a/Spigot-Server-Patches/0201-Enforce-Sync-Chunk-Unloads.patch +++ b/Spigot-Server-Patches/0200-Enforce-Sync-Chunk-Unloads.patch @@ -1,4 +1,4 @@ -From 1ab1eeef8cf388f5954415e9989ee13079827b1b Mon Sep 17 00:00:00 2001 +From 2b343988be36223a17839d831ea5297856599981 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 16:06:44 -0500 Subject: [PATCH] Enforce Sync Chunk Unloads @@ -7,7 +7,7 @@ Unloading Chunks async is extremely dangerous. This will force it to main the same way we handle async chunk loads. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index b42074706..b837a921c 100644 +index b4207470..b837a921 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -238,6 +238,7 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0202-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0201-Don-t-allow-entities-to-ride-themselves-572.patch similarity index 88% rename from Spigot-Server-Patches/0202-Don-t-allow-entities-to-ride-themselves-572.patch rename to Spigot-Server-Patches/0201-Don-t-allow-entities-to-ride-themselves-572.patch index 655c11e64b..49ce781f7d 100644 --- a/Spigot-Server-Patches/0202-Don-t-allow-entities-to-ride-themselves-572.patch +++ b/Spigot-Server-Patches/0201-Don-t-allow-entities-to-ride-themselves-572.patch @@ -1,11 +1,11 @@ -From cfe4d3ebc8948c00995082dd7ead69f8155ee75f Mon Sep 17 00:00:00 2001 +From ae7ef20b19148e89f33b465fd8ff1dc210755dd6 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Sun, 8 Jan 2017 04:31:36 +0000 Subject: [PATCH] Don't allow entities to ride themselves - #572 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 1e295432e..6fcced926 100644 +index 1e295432..6fcced92 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1917,6 +1917,7 @@ public abstract class Entity implements ICommandListener { diff --git a/Spigot-Server-Patches/0203-Fix-block-break-desync.patch b/Spigot-Server-Patches/0202-Fix-block-break-desync.patch similarity index 89% rename from Spigot-Server-Patches/0203-Fix-block-break-desync.patch rename to Spigot-Server-Patches/0202-Fix-block-break-desync.patch index c7861015fe..a43a90eb20 100644 --- a/Spigot-Server-Patches/0203-Fix-block-break-desync.patch +++ b/Spigot-Server-Patches/0202-Fix-block-break-desync.patch @@ -1,11 +1,11 @@ -From 69fbed512f6d72e4b71b362d24a6bbe95f1a8679 Mon Sep 17 00:00:00 2001 +From 4455838df6bf9026d3ac21af134d2f7cf7d311a7 Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Sun, 8 Jan 2017 18:50:35 +1100 Subject: [PATCH] Fix block break desync diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 70af4ebbb..0e2f43b96 100644 +index 70af4ebb..0e2f43b9 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -830,6 +830,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { diff --git a/Spigot-Server-Patches/0204-Assign-the-World-in-WorldGenStronghold.patch b/Spigot-Server-Patches/0203-Assign-the-World-in-WorldGenStronghold.patch similarity index 88% rename from Spigot-Server-Patches/0204-Assign-the-World-in-WorldGenStronghold.patch rename to Spigot-Server-Patches/0203-Assign-the-World-in-WorldGenStronghold.patch index e3dcf9eaf4..bbd74c79f5 100644 --- a/Spigot-Server-Patches/0204-Assign-the-World-in-WorldGenStronghold.patch +++ b/Spigot-Server-Patches/0203-Assign-the-World-in-WorldGenStronghold.patch @@ -1,11 +1,11 @@ -From b20fb77c753ccf663d5604c5fc1003f45c201e31 Mon Sep 17 00:00:00 2001 +From ee446bce1a72c18ec83261e53a8536f72ffc2b5c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 14 Jan 2017 01:22:07 -0600 Subject: [PATCH] Assign the World in WorldGenStronghold diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java -index c93754704..a3b958e01 100644 +index c9375470..a3b958e0 100644 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java @@ -56,6 +56,7 @@ public class WorldGenStronghold extends StructureGenerator { diff --git a/Spigot-Server-Patches/0205-Add-fromBottle-flag-to-Experience-Orbs.patch b/Spigot-Server-Patches/0204-Add-fromBottle-flag-to-Experience-Orbs.patch similarity index 94% rename from Spigot-Server-Patches/0205-Add-fromBottle-flag-to-Experience-Orbs.patch rename to Spigot-Server-Patches/0204-Add-fromBottle-flag-to-Experience-Orbs.patch index e95e70a2c4..7d4b45fb22 100644 --- a/Spigot-Server-Patches/0205-Add-fromBottle-flag-to-Experience-Orbs.patch +++ b/Spigot-Server-Patches/0204-Add-fromBottle-flag-to-Experience-Orbs.patch @@ -1,11 +1,11 @@ -From c6f53e639421d71e3b58517e5b29300eb1dac94a Mon Sep 17 00:00:00 2001 +From 11f2e6a94b8554c5c3c40740b6931bcec25a59a4 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 14 Jan 2017 16:15:26 -0600 Subject: [PATCH] Add fromBottle flag to Experience Orbs diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index 14431b8ad..54c9200a9 100644 +index 14431b8a..54c9200a 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -15,6 +15,14 @@ public class EntityExperienceOrb extends Entity { @@ -37,7 +37,7 @@ index 14431b8ad..54c9200a9 100644 return false; } diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java -index 0255986fd..289312950 100644 +index 0255986f..28931295 100644 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java @@ -40,7 +40,7 @@ public class EntityThrownExpBottle extends EntityProjectile { @@ -50,7 +50,7 @@ index 0255986fd..289312950 100644 this.die(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java -index 3a09cab3d..61e3c6c3e 100644 +index 3a09cab3..61e3c6c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java @@ -18,6 +18,13 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb { diff --git a/Spigot-Server-Patches/0206-Remove-the-Vanilla-Method-Profiler.patch b/Spigot-Server-Patches/0205-Remove-the-Vanilla-Method-Profiler.patch similarity index 96% rename from Spigot-Server-Patches/0206-Remove-the-Vanilla-Method-Profiler.patch rename to Spigot-Server-Patches/0205-Remove-the-Vanilla-Method-Profiler.patch index 605be42fa5..24dcba73d0 100644 --- a/Spigot-Server-Patches/0206-Remove-the-Vanilla-Method-Profiler.patch +++ b/Spigot-Server-Patches/0205-Remove-the-Vanilla-Method-Profiler.patch @@ -1,4 +1,4 @@ -From 9e8045ad1b42d3f5cfab491f4844299d853ffa4e Mon Sep 17 00:00:00 2001 +From 6c4294e444a8a0bce3a404b84cd25388a2c3b25b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jan 2017 02:00:33 -0500 Subject: [PATCH] Remove the Vanilla Method Profiler @@ -11,7 +11,7 @@ added, so we do not want any risk of performance degredation. Paper has a proper Timings system that makes the Vanilla Method profiler obsolete and inferior. diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java -index fe58d428f..938f62f83 100644 +index fe58d428..938f62f8 100644 --- a/src/main/java/net/minecraft/server/CommandDebug.java +++ b/src/main/java/net/minecraft/server/CommandDebug.java @@ -33,12 +33,11 @@ public class CommandDebug extends CommandAbstract { @@ -40,7 +40,7 @@ index fe58d428f..938f62f83 100644 public List tabComplete(MinecraftServer minecraftserver, ICommandListener icommandlistener, String[] astring, @Nullable BlockPosition blockposition) { diff --git a/src/main/java/net/minecraft/server/MethodProfiler.java b/src/main/java/net/minecraft/server/MethodProfiler.java -index 654652916..276983485 100644 +index 65465291..27698348 100644 --- a/src/main/java/net/minecraft/server/MethodProfiler.java +++ b/src/main/java/net/minecraft/server/MethodProfiler.java @@ -9,8 +9,9 @@ import java.util.List; diff --git a/Spigot-Server-Patches/0207-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0206-Cap-Entity-Collisions.patch similarity index 93% rename from Spigot-Server-Patches/0207-Cap-Entity-Collisions.patch rename to Spigot-Server-Patches/0206-Cap-Entity-Collisions.patch index 8c4ec50903..03fbb17253 100644 --- a/Spigot-Server-Patches/0207-Cap-Entity-Collisions.patch +++ b/Spigot-Server-Patches/0206-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From d378a0ea944732d41e4d3095add7fc25171b2b6e Mon Sep 17 00:00:00 2001 +From f9ef38071405f1b311bf12dacd221d2b17fe298c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 22 Jan 2017 18:07:56 -0500 Subject: [PATCH] Cap Entity Collisions @@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped. You can set this to 0 to disable collisions. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 61efcc479..4898e8bce 100644 +index 61efcc47..4898e8bc 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -408,4 +408,10 @@ public class PaperWorldConfig { @@ -27,7 +27,7 @@ index 61efcc479..4898e8bce 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 6fcced926..cfeff7c48 100644 +index 6fcced92..cfeff7c4 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -168,6 +168,7 @@ public abstract class Entity implements ICommandListener { @@ -39,7 +39,7 @@ index 6fcced926..cfeff7c48 100644 // Spigot end diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 7242da9cc..53486e205 100644 +index 7242da9c..53486e20 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2132,8 +2132,11 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0208-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch b/Spigot-Server-Patches/0207-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch similarity index 93% rename from Spigot-Server-Patches/0208-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch rename to Spigot-Server-Patches/0207-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch index 68b86395bf..d3484f0d31 100644 --- a/Spigot-Server-Patches/0208-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch +++ b/Spigot-Server-Patches/0207-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch @@ -1,11 +1,11 @@ -From 73fc939332153a40845637a3a06f3cbb0f43a678 Mon Sep 17 00:00:00 2001 +From 058a0cb81978b5cf20cc32ab63e81de4b1a0f63c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 23 Jan 2017 15:10:25 -0600 Subject: [PATCH] Do not allow a zero max height in BiomeJungle diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java -index a4e5e4933..20c18cdbd 100644 +index a4e5e493..20c18cdb 100644 --- a/src/main/java/net/minecraft/server/BiomeJungle.java +++ b/src/main/java/net/minecraft/server/BiomeJungle.java @@ -39,7 +39,11 @@ public class BiomeJungle extends BiomeBase { @@ -22,7 +22,7 @@ index a4e5e4933..20c18cdbd 100644 (new WorldGenMelon()).generate(world, random, blockposition.a(i, k, j)); WorldGenVines worldgenvines = new WorldGenVines(); diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 6a0b3a62d..38a7af58c 100644 +index 6a0b3a62..38a7af58 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -42,6 +42,7 @@ public class BlockPosition extends BaseBlockPosition { diff --git a/Spigot-Server-Patches/0209-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0208-Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 96% rename from Spigot-Server-Patches/0209-Remove-CraftScheduler-Async-Task-Debugger.patch rename to Spigot-Server-Patches/0208-Remove-CraftScheduler-Async-Task-Debugger.patch index 65f69a54f9..a8990f0cd5 100644 --- a/Spigot-Server-Patches/0209-Remove-CraftScheduler-Async-Task-Debugger.patch +++ b/Spigot-Server-Patches/0208-Remove-CraftScheduler-Async-Task-Debugger.patch @@ -1,4 +1,4 @@ -From 8394a8f5806921572c00dabe6b02756318ee5836 Mon Sep 17 00:00:00 2001 +From 3e17aa98688af91237bb7e386a5846e55d6a1aed Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 5 Feb 2017 00:04:04 -0500 Subject: [PATCH] Remove CraftScheduler Async Task Debugger @@ -9,7 +9,7 @@ One report of a suspected memory leak with the system. This adds additional overhead to asynchronous task dispatching diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index e30cfb7b7..448c27cc7 100644 +index e30cfb7b..448c27cc 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -80,8 +80,8 @@ public class CraftScheduler implements BukkitScheduler { diff --git a/Spigot-Server-Patches/0210-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0209-Shame-on-you-Mojang.patch similarity index 95% rename from Spigot-Server-Patches/0210-Shame-on-you-Mojang.patch rename to Spigot-Server-Patches/0209-Shame-on-you-Mojang.patch index ed284ca780..bf7412685d 100644 --- a/Spigot-Server-Patches/0210-Shame-on-you-Mojang.patch +++ b/Spigot-Server-Patches/0209-Shame-on-you-Mojang.patch @@ -1,4 +1,4 @@ -From e2d75d281532b21019d76ef1b04dd0320caf67bc Mon Sep 17 00:00:00 2001 +From 6e834104fb58905edaea685fe77342ccc26bd5eb Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 5 Feb 2017 19:17:28 -0500 Subject: [PATCH] Shame on you Mojang @@ -12,7 +12,7 @@ This then triggers async chunk loads! What in the hell were you thinking? diff --git a/src/main/java/net/minecraft/server/BlockBeacon.java b/src/main/java/net/minecraft/server/BlockBeacon.java -index f44f05620..74c371179 100644 +index f44f0562..74c37117 100644 --- a/src/main/java/net/minecraft/server/BlockBeacon.java +++ b/src/main/java/net/minecraft/server/BlockBeacon.java @@ -62,8 +62,8 @@ public class BlockBeacon extends BlockTileEntity { diff --git a/Spigot-Server-Patches/0211-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0210-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch similarity index 91% rename from Spigot-Server-Patches/0211-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch rename to Spigot-Server-Patches/0210-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch index 85c5dcea1d..9f403f809a 100644 --- a/Spigot-Server-Patches/0211-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch +++ b/Spigot-Server-Patches/0210-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch @@ -1,11 +1,11 @@ -From f68cbaa70b7d1afcaa4f105dcc0b8aa1b8760211 Mon Sep 17 00:00:00 2001 +From d9a36a3de6454128f14ae7c8f154e00b17cb3d89 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 7 Feb 2017 16:55:35 -0600 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 7006466b5..c32fb3ef5 100644 +index 7006466b..c32fb3ef 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -325,7 +325,7 @@ public class ChunkProviderServer implements IChunkProvider { diff --git a/Spigot-Server-Patches/0212-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0211-Do-not-let-armorstands-drown.patch similarity index 93% rename from Spigot-Server-Patches/0212-Do-not-let-armorstands-drown.patch rename to Spigot-Server-Patches/0211-Do-not-let-armorstands-drown.patch index 10009427d6..99630f47d9 100644 --- a/Spigot-Server-Patches/0212-Do-not-let-armorstands-drown.patch +++ b/Spigot-Server-Patches/0211-Do-not-let-armorstands-drown.patch @@ -1,11 +1,11 @@ -From 376d55c29584c06cd6b5b4503b35fe6e544589f5 Mon Sep 17 00:00:00 2001 +From 67b246c935f33eacd625d35e7d16d2f3dcf5f1dc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 18 Feb 2017 19:29:58 -0600 Subject: [PATCH] Do not let armorstands drown diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 7738ca385..5818aa5e9 100644 +index 7738ca38..5818aa5e 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -772,5 +772,10 @@ public class EntityArmorStand extends EntityLiving { @@ -20,7 +20,7 @@ index 7738ca385..5818aa5e9 100644 // Paper end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 53486e205..9b7159450 100644 +index 53486e20..9b715945 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -188,6 +188,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0213-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch b/Spigot-Server-Patches/0212-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch similarity index 91% rename from Spigot-Server-Patches/0213-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch rename to Spigot-Server-Patches/0212-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch index 02040d7a6a..285b70e149 100644 --- a/Spigot-Server-Patches/0213-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch +++ b/Spigot-Server-Patches/0212-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch @@ -1,4 +1,4 @@ -From dcb65d22eb0e78a572a42148271143f8a012c813 Mon Sep 17 00:00:00 2001 +From 2f6bff5870596a421be90ada961ce01b515e9089 Mon Sep 17 00:00:00 2001 From: kashike Date: Sun, 9 Apr 2017 23:50:15 -0700 Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack @@ -6,7 +6,7 @@ Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack Thanks @gabizou diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 45ebd3f61..cf204f41f 100644 +index 45ebd3f6..cf204f41 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -97,7 +97,7 @@ public final class ItemStack {