From 298f2a4cdf52da7f3b67c33c6518f043ff0d214a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 13 Sep 2018 12:17:01 -0400 Subject: [PATCH] Update branch name for GitHub version checking --- .../0007-Check-Paper-versions.patch | 17 ++++--- ...ch => 0122-Add-async-chunk-load-API.patch} | 6 +-- ...ic-1.13-versioning-branch-build-name.patch | 44 ------------------- ...ts.patch => 0123-EnderDragon-Events.patch} | 10 ++--- ...=> 0124-PlayerLaunchProjectileEvent.patch} | 6 +-- ...atch => 0125-PlayerElytraBoostEvent.patch} | 6 +-- ...atch => 0126-EntityTransformedEvent.patch} | 6 +-- ...llow-disabling-armour-stand-ticking.patch} | 6 +-- ...tch => 0128-SkeletonHorse-Additions.patch} | 8 ++-- ...29-Expand-Location-Manipulation-API.patch} | 6 +-- ...patch => 0130-Expand-ArmorStand-API.patch} | 6 +-- ...vent.patch => 0131-AnvilDamageEvent.patch} | 6 +-- ...eadlock-risk-in-firing-async-events.patch} | 8 ++-- ...h => 0133-Add-hand-to-bucket-events.patch} | 10 ++--- ...ent.patch => 0134-Add-TNTPrimeEvent.patch} | 6 +-- ...ide-Chunk-Coordinates-as-a-Long-API.patch} | 8 ++-- ...=> 0136-Make-EnderDragon-extend-Mob.patch} | 6 +-- ...le-Entities-from-a-chunk-without-sn.patch} | 6 +-- ...ots-for-Timings-Tile-Entity-reports.patch} | 6 +-- ...locks-to-be-accessed-via-a-long-key.patch} | 10 ++--- ...tch => 0140-Slime-Pathfinder-Events.patch} | 16 +++---- ....patch => 0141-isChunkGenerated-API.patch} | 8 ++-- ....patch => 0142-Add-More-Creeper-API.patch} | 8 ++-- ...ch => 0143-Add-PhantomPreSpawnEvent.patch} | 8 ++-- ...d-source-block-to-BlockPhysicsEvent.patch} | 6 +-- ... => 0145-Add-Force-Loaded-Chunk-API.patch} | 8 ++-- ...=> 0146-Inventory-removeItemAnySlot.patch} | 6 +-- ...ray-tracing-methods-to-LivingEntity.patch} | 8 ++-- ....patch => 0148-Improve-death-events.patch} | 6 +-- ...I.patch => 0149-Mob-Pathfinding-API.patch} | 8 ++-- 30 files changed, 112 insertions(+), 157 deletions(-) rename Spigot-API-Patches/{0123-Add-async-chunk-load-API.patch => 0122-Add-async-chunk-load-API.patch} (97%) delete mode 100644 Spigot-API-Patches/0122-Use-specific-1.13-versioning-branch-build-name.patch rename Spigot-API-Patches/{0124-EnderDragon-Events.patch => 0123-EnderDragon-Events.patch} (97%) rename Spigot-API-Patches/{0125-PlayerLaunchProjectileEvent.patch => 0124-PlayerLaunchProjectileEvent.patch} (96%) rename Spigot-API-Patches/{0126-PlayerElytraBoostEvent.patch => 0125-PlayerElytraBoostEvent.patch} (96%) rename Spigot-API-Patches/{0127-EntityTransformedEvent.patch => 0126-EntityTransformedEvent.patch} (96%) rename Spigot-API-Patches/{0128-Allow-disabling-armour-stand-ticking.patch => 0127-Allow-disabling-armour-stand-ticking.patch} (90%) rename Spigot-API-Patches/{0129-SkeletonHorse-Additions.patch => 0128-SkeletonHorse-Additions.patch} (94%) rename Spigot-API-Patches/{0130-Expand-Location-Manipulation-API.patch => 0129-Expand-Location-Manipulation-API.patch} (95%) rename Spigot-API-Patches/{0131-Expand-ArmorStand-API.patch => 0130-Expand-ArmorStand-API.patch} (97%) rename Spigot-API-Patches/{0132-AnvilDamageEvent.patch => 0131-AnvilDamageEvent.patch} (97%) rename Spigot-API-Patches/{0133-Remove-deadlock-risk-in-firing-async-events.patch => 0132-Remove-deadlock-risk-in-firing-async-events.patch} (97%) rename Spigot-API-Patches/{0134-Add-hand-to-bucket-events.patch => 0133-Add-hand-to-bucket-events.patch} (96%) rename Spigot-API-Patches/{0135-Add-TNTPrimeEvent.patch => 0134-Add-TNTPrimeEvent.patch} (97%) rename Spigot-API-Patches/{0136-Provide-Chunk-Coordinates-as-a-Long-API.patch => 0135-Provide-Chunk-Coordinates-as-a-Long-API.patch} (93%) rename Spigot-API-Patches/{0137-Make-EnderDragon-extend-Mob.patch => 0136-Make-EnderDragon-extend-Mob.patch} (86%) rename Spigot-API-Patches/{0138-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (90%) rename Spigot-API-Patches/{0139-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch => 0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch} (89%) rename Spigot-API-Patches/{0140-Allow-Blocks-to-be-accessed-via-a-long-key.patch => 0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch} (96%) rename Spigot-API-Patches/{0141-Slime-Pathfinder-Events.patch => 0140-Slime-Pathfinder-Events.patch} (96%) rename Spigot-API-Patches/{0142-isChunkGenerated-API.patch => 0141-isChunkGenerated-API.patch} (94%) rename Spigot-API-Patches/{0143-Add-More-Creeper-API.patch => 0142-Add-More-Creeper-API.patch} (95%) rename Spigot-API-Patches/{0144-Add-PhantomPreSpawnEvent.patch => 0143-Add-PhantomPreSpawnEvent.patch} (93%) rename Spigot-API-Patches/{0145-Add-source-block-to-BlockPhysicsEvent.patch => 0144-Add-source-block-to-BlockPhysicsEvent.patch} (93%) rename Spigot-API-Patches/{0146-Add-Force-Loaded-Chunk-API.patch => 0145-Add-Force-Loaded-Chunk-API.patch} (92%) rename Spigot-API-Patches/{0147-Inventory-removeItemAnySlot.patch => 0146-Inventory-removeItemAnySlot.patch} (94%) rename Spigot-API-Patches/{0148-Add-ray-tracing-methods-to-LivingEntity.patch => 0147-Add-ray-tracing-methods-to-LivingEntity.patch} (97%) rename Spigot-API-Patches/{0149-Improve-death-events.patch => 0148-Improve-death-events.patch} (98%) rename Spigot-API-Patches/{0150-Mob-Pathfinding-API.patch => 0149-Mob-Pathfinding-API.patch} (98%) diff --git a/Spigot-API-Patches/0007-Check-Paper-versions.patch b/Spigot-API-Patches/0007-Check-Paper-versions.patch index 3e47adcd30..9f24f1866a 100644 --- a/Spigot-API-Patches/0007-Check-Paper-versions.patch +++ b/Spigot-API-Patches/0007-Check-Paper-versions.patch @@ -1,11 +1,11 @@ -From 04153abcdce66e6c07ab6ee82ecc367ebf6de536 Mon Sep 17 00:00:00 2001 +From 044a6e8b11ac010734eec362f0187c7b844a450c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 17:58:01 -0600 Subject: [PATCH] Check Paper versions diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -index 760d58eb..044361af 100644 +index 760d58eb..52952aa4 100644 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java @@ -28,6 +28,11 @@ import org.json.simple.JSONObject; @@ -82,13 +82,13 @@ index 760d58eb..044361af 100644 + return getFromJenkins(currentVer); + } catch (NumberFormatException ex) { + verInfo = verInfo.replace("\"", ""); -+ return getFromRepo("PaperMC/Paper", verInfo); ++ return getFromRepo("PaperMC/Paper", "master", verInfo); + } + /* BufferedReader reader = Resources.asCharSource( new URL("https://hub.spigotmc.org/stash/rest/api/1.0/projects/SPIGOT/repos/" + repo + "/commits?since=" + URLEncoder.encode(hash, "UTF-8") + "&withCounts=true"), Charsets.UTF_8 -@@ -247,9 +264,58 @@ public class VersionCommand extends BukkitCommand { +@@ -247,9 +264,57 @@ public class VersionCommand extends BukkitCommand { } finally { reader.close(); } @@ -98,7 +98,7 @@ index 760d58eb..044361af 100644 + private static int getFromJenkins(int currentVer) { + try { + BufferedReader reader = Resources.asCharSource( -+ new URL("https://ci.destroystokyo.com/job/Paper/lastSuccessfulBuild/buildNumber"), // Paper ++ new URL("https://ci.destroystokyo.com/job/Paper-1.13/lastSuccessfulBuild/buildNumber"), // Paper + Charsets.UTF_8 + ).openBufferedStream(); + try { @@ -117,10 +117,9 @@ index 760d58eb..044361af 100644 + } + + // Contributed by Techcable in GH PR #65 -+ private static final String BRANCH = "master"; -+ private static int getFromRepo(String repo, String hash) { ++ private static int getFromRepo(String repo, String branch, String hash) { + try { -+ HttpURLConnection connection = (HttpURLConnection) new URL("https://api.github.com/repos/" + repo + "/compare/" + BRANCH + "..." + hash).openConnection(); ++ HttpURLConnection connection = (HttpURLConnection) new URL("https://api.github.com/repos/" + repo + "/compare/" + branch + "..." + hash).openConnection(); + connection.connect(); + if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) return -2; // Unknown commit + try ( @@ -148,5 +147,5 @@ index 760d58eb..044361af 100644 + // Paper end } -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0123-Add-async-chunk-load-API.patch b/Spigot-API-Patches/0122-Add-async-chunk-load-API.patch similarity index 97% rename from Spigot-API-Patches/0123-Add-async-chunk-load-API.patch rename to Spigot-API-Patches/0122-Add-async-chunk-load-API.patch index 04b3228c93..99ddfcc50d 100644 --- a/Spigot-API-Patches/0123-Add-async-chunk-load-API.patch +++ b/Spigot-API-Patches/0122-Add-async-chunk-load-API.patch @@ -1,11 +1,11 @@ -From b242c5647547578b7d9d41871ce3e6f9a3e07931 Mon Sep 17 00:00:00 2001 +From 7ddb76e8301b2f48545ea48d9bd3f965b643054b Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 17:43:33 -0600 Subject: [PATCH] Add async chunk load API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 5e6cb56ab..dbbcfec99 100644 +index 5e6cb56a..dbbcfec9 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -137,6 +137,78 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -88,5 +88,5 @@ index 5e6cb56ab..dbbcfec99 100644 * Checks if the specified {@link Chunk} is loaded * -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0122-Use-specific-1.13-versioning-branch-build-name.patch b/Spigot-API-Patches/0122-Use-specific-1.13-versioning-branch-build-name.patch deleted file mode 100644 index 35633e74ea..0000000000 --- a/Spigot-API-Patches/0122-Use-specific-1.13-versioning-branch-build-name.patch +++ /dev/null @@ -1,44 +0,0 @@ -From bbb9cf97e9b7033826d511f51950b79c2741fe10 Mon Sep 17 00:00:00 2001 -From: Zach Brown -Date: Thu, 19 Jul 2018 17:32:47 -0500 -Subject: [PATCH] Use specific 1.13 versioning branch/build name - - -diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -index c45faf4cb..7041085c3 100644 ---- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java -+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -@@ -266,7 +266,7 @@ public class VersionCommand extends BukkitCommand { - return getFromJenkins(currentVer); - } catch (NumberFormatException ex) { - verInfo = verInfo.replace("\"", ""); -- return getFromRepo("PaperMC/Paper", verInfo); -+ return getFromRepo("PaperMC/Paper", "pre/1.13", verInfo); - } - /* - BufferedReader reader = Resources.asCharSource( -@@ -288,7 +288,7 @@ public class VersionCommand extends BukkitCommand { - private static int getFromJenkins(int currentVer) { - try { - BufferedReader reader = Resources.asCharSource( -- new URL("https://ci.destroystokyo.com/job/Paper/lastSuccessfulBuild/buildNumber"), // Paper -+ new URL("https://ci.destroystokyo.com/job/Paper-1.13/lastSuccessfulBuild/buildNumber"), // Paper - Charsets.UTF_8 - ).openBufferedStream(); - try { -@@ -307,10 +307,9 @@ public class VersionCommand extends BukkitCommand { - } - - // Contributed by Techcable in GH PR #65 -- private static final String BRANCH = "master"; -- private static int getFromRepo(String repo, String hash) { -+ private static int getFromRepo(String repo, String branch, String hash) { - try { -- HttpURLConnection connection = (HttpURLConnection) new URL("https://api.github.com/repos/" + repo + "/compare/" + BRANCH + "..." + hash).openConnection(); -+ HttpURLConnection connection = (HttpURLConnection) new URL("https://api.github.com/repos/" + repo + "/compare/" + branch + "..." + hash).openConnection(); - connection.connect(); - if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) return -2; // Unknown commit - try ( --- -2.18.0 - diff --git a/Spigot-API-Patches/0124-EnderDragon-Events.patch b/Spigot-API-Patches/0123-EnderDragon-Events.patch similarity index 97% rename from Spigot-API-Patches/0124-EnderDragon-Events.patch rename to Spigot-API-Patches/0123-EnderDragon-Events.patch index 4dde928181..aab6088d18 100644 --- a/Spigot-API-Patches/0124-EnderDragon-Events.patch +++ b/Spigot-API-Patches/0123-EnderDragon-Events.patch @@ -1,4 +1,4 @@ -From 5820519ee336a827ab94afff4c21d4e8c51bc7aa Mon Sep 17 00:00:00 2001 +From 3c76bffe535e420aed08fd34bb95d98aac839102 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:51:05 -0500 Subject: [PATCH] EnderDragon Events @@ -6,7 +6,7 @@ Subject: [PATCH] EnderDragon Events diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java new file mode 100644 -index 000000000..ef2a8dab9 +index 00000000..ef2a8dab --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java @@ -0,0 +1,72 @@ @@ -84,7 +84,7 @@ index 000000000..ef2a8dab9 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java new file mode 100644 -index 000000000..d8c3ab330 +index 00000000..d8c3ab33 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java @@ -0,0 +1,56 @@ @@ -146,7 +146,7 @@ index 000000000..d8c3ab330 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java new file mode 100644 -index 000000000..aa70dda10 +index 00000000..aa70dda1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java @@ -0,0 +1,56 @@ @@ -207,5 +207,5 @@ index 000000000..aa70dda10 + } +} -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0125-PlayerLaunchProjectileEvent.patch b/Spigot-API-Patches/0124-PlayerLaunchProjectileEvent.patch similarity index 96% rename from Spigot-API-Patches/0125-PlayerLaunchProjectileEvent.patch rename to Spigot-API-Patches/0124-PlayerLaunchProjectileEvent.patch index 4af340d849..263b01bbc8 100644 --- a/Spigot-API-Patches/0125-PlayerLaunchProjectileEvent.patch +++ b/Spigot-API-Patches/0124-PlayerLaunchProjectileEvent.patch @@ -1,4 +1,4 @@ -From c485f341e92f90206dba384bf59f0e7ae09b30ef Mon Sep 17 00:00:00 2001 +From ae56a3fc7ab54bb3acb88fb67a82f7265aee6204 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 03:10:50 -0500 Subject: [PATCH] PlayerLaunchProjectileEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerLaunchProjectileEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java new file mode 100644 -index 000000000..d2b244a41 +index 00000000..d2b244a4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java @@ -0,0 +1,78 @@ @@ -89,5 +89,5 @@ index 000000000..d2b244a41 + } +} -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0126-PlayerElytraBoostEvent.patch b/Spigot-API-Patches/0125-PlayerElytraBoostEvent.patch similarity index 96% rename from Spigot-API-Patches/0126-PlayerElytraBoostEvent.patch rename to Spigot-API-Patches/0125-PlayerElytraBoostEvent.patch index f7c4ee3d2d..0a0d272732 100644 --- a/Spigot-API-Patches/0126-PlayerElytraBoostEvent.patch +++ b/Spigot-API-Patches/0125-PlayerElytraBoostEvent.patch @@ -1,4 +1,4 @@ -From d9fb4116f080c9844659b75a518d3b7708b3f665 Mon Sep 17 00:00:00 2001 +From 87dfe3fa6543580dcbdcad9f3ea10049ad597d29 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:59:53 -0500 Subject: [PATCH] PlayerElytraBoostEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerElytraBoostEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java new file mode 100644 -index 000000000..cecb2182c +index 00000000..cecb2182 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java @@ -0,0 +1,80 @@ @@ -91,5 +91,5 @@ index 000000000..cecb2182c + } +} -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0127-EntityTransformedEvent.patch b/Spigot-API-Patches/0126-EntityTransformedEvent.patch similarity index 96% rename from Spigot-API-Patches/0127-EntityTransformedEvent.patch rename to Spigot-API-Patches/0126-EntityTransformedEvent.patch index 89743a4f1d..f476777828 100644 --- a/Spigot-API-Patches/0127-EntityTransformedEvent.patch +++ b/Spigot-API-Patches/0126-EntityTransformedEvent.patch @@ -1,4 +1,4 @@ -From 2450564e1365b81ba112638f20f937caf306e003 Mon Sep 17 00:00:00 2001 +From 4e0b2a8d9666020afc83f97bd3fcb0987fa3058e Mon Sep 17 00:00:00 2001 From: Anthony MacAllister Date: Thu, 26 Jul 2018 15:28:53 -0400 Subject: [PATCH] EntityTransformedEvent @@ -6,7 +6,7 @@ Subject: [PATCH] EntityTransformedEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java new file mode 100644 -index 000000000..d9e5cab95 +index 00000000..d9e5cab9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java @@ -0,0 +1,85 @@ @@ -96,5 +96,5 @@ index 000000000..d9e5cab95 + } +} -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0128-Allow-disabling-armour-stand-ticking.patch b/Spigot-API-Patches/0127-Allow-disabling-armour-stand-ticking.patch similarity index 90% rename from Spigot-API-Patches/0128-Allow-disabling-armour-stand-ticking.patch rename to Spigot-API-Patches/0127-Allow-disabling-armour-stand-ticking.patch index e79c2069d2..f0e3af40b4 100644 --- a/Spigot-API-Patches/0128-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-API-Patches/0127-Allow-disabling-armour-stand-ticking.patch @@ -1,11 +1,11 @@ -From 474a840b2cdb4bd68afd54e9d5cd97f7195c58f6 Mon Sep 17 00:00:00 2001 +From e0d00c017e6e25327d7fbabc1db99678b593a565 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 15 Aug 2018 01:26:03 -0700 Subject: [PATCH] Allow disabling armour stand ticking diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index 099da6ce1..859f166fb 100644 +index 099da6ce..859f166f 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -275,5 +275,21 @@ public interface ArmorStand extends LivingEntity { @@ -31,5 +31,5 @@ index 099da6ce1..859f166fb 100644 // Paper end } -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0129-SkeletonHorse-Additions.patch b/Spigot-API-Patches/0128-SkeletonHorse-Additions.patch similarity index 94% rename from Spigot-API-Patches/0129-SkeletonHorse-Additions.patch rename to Spigot-API-Patches/0128-SkeletonHorse-Additions.patch index a915c3ad0f..b6dd90bce8 100644 --- a/Spigot-API-Patches/0129-SkeletonHorse-Additions.patch +++ b/Spigot-API-Patches/0128-SkeletonHorse-Additions.patch @@ -1,4 +1,4 @@ -From e7af83191e6add9b98b5233a119f4fe20e0b2393 Mon Sep 17 00:00:00 2001 +From 18b469ac5ad5d82fd19b75ec006a37e47936864d Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 27 Jul 2018 22:36:17 -0500 Subject: [PATCH] SkeletonHorse Additions @@ -6,7 +6,7 @@ Subject: [PATCH] SkeletonHorse Additions diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java new file mode 100644 -index 000000000..55bae018e +index 00000000..55bae018 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java @@ -0,0 +1,43 @@ @@ -54,7 +54,7 @@ index 000000000..55bae018e +} + diff --git a/src/main/java/org/bukkit/entity/SkeletonHorse.java b/src/main/java/org/bukkit/entity/SkeletonHorse.java -index b2c6b6a86..ba9983463 100644 +index b2c6b6a8..ba998346 100644 --- a/src/main/java/org/bukkit/entity/SkeletonHorse.java +++ b/src/main/java/org/bukkit/entity/SkeletonHorse.java @@ -3,4 +3,12 @@ package org.bukkit.entity; @@ -72,5 +72,5 @@ index b2c6b6a86..ba9983463 100644 + // Paper end +} -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0130-Expand-Location-Manipulation-API.patch b/Spigot-API-Patches/0129-Expand-Location-Manipulation-API.patch similarity index 95% rename from Spigot-API-Patches/0130-Expand-Location-Manipulation-API.patch rename to Spigot-API-Patches/0129-Expand-Location-Manipulation-API.patch index 9dd99c4e10..7156342d53 100644 --- a/Spigot-API-Patches/0130-Expand-Location-Manipulation-API.patch +++ b/Spigot-API-Patches/0129-Expand-Location-Manipulation-API.patch @@ -1,4 +1,4 @@ -From 14ac1162650971ca6854d13efe2a4d4b13f28243 Mon Sep 17 00:00:00 2001 +From b4f68b0722a75ef3075a8fd42c275522d448a71c Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 25 Jul 2018 01:36:07 -0400 Subject: [PATCH] Expand Location Manipulation API @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Location Manipulation API Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z); diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 056a4d6bb..8dcb15fb8 100644 +index 056a4d6b..8dcb15fb 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -503,6 +503,51 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -62,5 +62,5 @@ index 056a4d6bb..8dcb15fb8 100644 * @return A new location where X/Y/Z are on the Block location (integer value of X/Y/Z) */ -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0131-Expand-ArmorStand-API.patch b/Spigot-API-Patches/0130-Expand-ArmorStand-API.patch similarity index 97% rename from Spigot-API-Patches/0131-Expand-ArmorStand-API.patch rename to Spigot-API-Patches/0130-Expand-ArmorStand-API.patch index 2219a329ee..507d75eb7b 100644 --- a/Spigot-API-Patches/0131-Expand-ArmorStand-API.patch +++ b/Spigot-API-Patches/0130-Expand-ArmorStand-API.patch @@ -1,4 +1,4 @@ -From 71390973372ce416105b11f6c390e5f4f4caa46b Mon Sep 17 00:00:00 2001 +From f58b6b90a61293cba3dae328d626b0b217afbbc7 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Thu, 26 Jul 2018 02:22:44 -0400 Subject: [PATCH] Expand ArmorStand API @@ -8,7 +8,7 @@ Add the following: - Enable/Disable slot interactions diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index 859f166fb..eda4873d5 100644 +index 859f166f..eda4873d 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -1,5 +1,6 @@ @@ -115,5 +115,5 @@ index 859f166fb..eda4873d5 100644 // Paper end } -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0132-AnvilDamageEvent.patch b/Spigot-API-Patches/0131-AnvilDamageEvent.patch similarity index 97% rename from Spigot-API-Patches/0132-AnvilDamageEvent.patch rename to Spigot-API-Patches/0131-AnvilDamageEvent.patch index bcd8840073..e0777dbdf7 100644 --- a/Spigot-API-Patches/0132-AnvilDamageEvent.patch +++ b/Spigot-API-Patches/0131-AnvilDamageEvent.patch @@ -1,4 +1,4 @@ -From 13eb6bc73408696497c7884114e1ce0fbb0b8ad3 Mon Sep 17 00:00:00 2001 +From 848e7a6b6c7c5f5cf4d40f9a5566ca9e54da2246 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 20 Jul 2018 23:36:55 -0500 Subject: [PATCH] AnvilDamageEvent @@ -6,7 +6,7 @@ Subject: [PATCH] AnvilDamageEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java new file mode 100644 -index 000000000..fd3c5c02e +index 00000000..fd3c5c02 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java @@ -0,0 +1,139 @@ @@ -150,5 +150,5 @@ index 000000000..fd3c5c02e + } +} -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0133-Remove-deadlock-risk-in-firing-async-events.patch b/Spigot-API-Patches/0132-Remove-deadlock-risk-in-firing-async-events.patch similarity index 97% rename from Spigot-API-Patches/0133-Remove-deadlock-risk-in-firing-async-events.patch rename to Spigot-API-Patches/0132-Remove-deadlock-risk-in-firing-async-events.patch index abebdf9b94..7a7c2746f7 100644 --- a/Spigot-API-Patches/0133-Remove-deadlock-risk-in-firing-async-events.patch +++ b/Spigot-API-Patches/0132-Remove-deadlock-risk-in-firing-async-events.patch @@ -1,4 +1,4 @@ -From 77036b521bed13898c2987f64afdf0b260b60548 Mon Sep 17 00:00:00 2001 +From b973baad7a6e6e970c515588e61ada683b1f67a8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 00:32:05 -0400 Subject: [PATCH] Remove deadlock risk in firing async events @@ -16,7 +16,7 @@ which results in a hard crash. This change removes the synchronize and adds some protection around enable/disable diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index cb2b0b9cb..a7dd902fb 100644 +index cb2b0b9c..a7dd902f 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -385,7 +385,7 @@ public final class SimplePluginManager implements PluginManager { @@ -79,7 +79,7 @@ index cb2b0b9cb..a7dd902fb 100644 RegisteredListener[] listeners = handlers.getRegisteredListeners(); diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java -index 6b86128e1..56308c0c6 100644 +index 6b86128e..56308c0c 100644 --- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java +++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java @@ -19,7 +19,7 @@ public class PluginManagerTest { @@ -118,5 +118,5 @@ index 6b86128e1..56308c0c6 100644 @Test public void testAsyncUnlocked() throws InterruptedException { -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0134-Add-hand-to-bucket-events.patch b/Spigot-API-Patches/0133-Add-hand-to-bucket-events.patch similarity index 96% rename from Spigot-API-Patches/0134-Add-hand-to-bucket-events.patch rename to Spigot-API-Patches/0133-Add-hand-to-bucket-events.patch index 2143ff1565..6b7e2f2813 100644 --- a/Spigot-API-Patches/0134-Add-hand-to-bucket-events.patch +++ b/Spigot-API-Patches/0133-Add-hand-to-bucket-events.patch @@ -1,11 +1,11 @@ -From 986c989e7b51b1b37e690d390cdcdb5befc410a5 Mon Sep 17 00:00:00 2001 +From 51ea14128492a66721efc64c903ed6ecd2e1ad64 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 2 Aug 2018 08:44:20 -0500 Subject: [PATCH] Add hand to bucket events diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java -index 8fb121a91..7b9596f30 100644 +index 8fb121a9..7b9596f3 100644 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java @@ -5,6 +5,7 @@ import org.bukkit.block.Block; @@ -30,7 +30,7 @@ index 8fb121a91..7b9596f30 100644 public HandlerList getHandlers() { return handlers; diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java -index 56584687f..3dbe428ba 100644 +index 56584687..3dbe428b 100644 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java @@ -5,6 +5,7 @@ import org.bukkit.block.Block; @@ -82,7 +82,7 @@ index 56584687f..3dbe428ba 100644 return cancelled; } diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java -index 94e042a36..884b9240b 100644 +index 94e042a3..884b9240 100644 --- a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java @@ -5,6 +5,7 @@ import org.bukkit.block.Block; @@ -107,5 +107,5 @@ index 94e042a36..884b9240b 100644 public HandlerList getHandlers() { return handlers; -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0135-Add-TNTPrimeEvent.patch b/Spigot-API-Patches/0134-Add-TNTPrimeEvent.patch similarity index 97% rename from Spigot-API-Patches/0135-Add-TNTPrimeEvent.patch rename to Spigot-API-Patches/0134-Add-TNTPrimeEvent.patch index 6edfbb0f03..b5970f9d72 100644 --- a/Spigot-API-Patches/0135-Add-TNTPrimeEvent.patch +++ b/Spigot-API-Patches/0134-Add-TNTPrimeEvent.patch @@ -1,4 +1,4 @@ -From add25b55a6954c077843feab9efe9eeabbe6251a Mon Sep 17 00:00:00 2001 +From 156ee02d35570260db0ce2de98e8e4629f9240f4 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 15 Jul 2018 22:17:55 +0300 Subject: [PATCH] Add TNTPrimeEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add TNTPrimeEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java new file mode 100644 -index 000000000..2ae8826bb +index 00000000..2ae8826b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java @@ -0,0 +1,108 @@ @@ -119,5 +119,5 @@ index 000000000..2ae8826bb + } +} -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch b/Spigot-API-Patches/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch similarity index 93% rename from Spigot-API-Patches/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch rename to Spigot-API-Patches/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch index f998d851e8..2de67f5acf 100644 --- a/Spigot-API-Patches/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch +++ b/Spigot-API-Patches/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch @@ -1,4 +1,4 @@ -From 6e8ec6f3316a2acd08fd6e2ce0b26e44665ec31f Mon Sep 17 00:00:00 2001 +From 87ec4277ddff0dbc66ef9cd2d3b61696e301ea7b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 4 Aug 2018 19:37:35 -0400 Subject: [PATCH] Provide Chunk Coordinates as a Long API @@ -7,7 +7,7 @@ Allows you to easily access the chunks X/z as a long, and a method to look up by the long key too. diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index 079b9febe..c75bce07a 100644 +index 079b9feb..c75bce07 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -23,6 +23,15 @@ public interface Chunk { @@ -27,7 +27,7 @@ index 079b9febe..c75bce07a 100644 * Gets the world containing this chunk * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index dbbcfec99..724088ec0 100644 +index dbbcfec9..724088ec 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -137,6 +137,21 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -53,5 +53,5 @@ index dbbcfec99..724088ec0 100644 * Used by {@link World#getChunkAtAsync(Location,ChunkLoadCallback)} methods * to request a {@link Chunk} to be loaded, with this callback receiving -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0137-Make-EnderDragon-extend-Mob.patch b/Spigot-API-Patches/0136-Make-EnderDragon-extend-Mob.patch similarity index 86% rename from Spigot-API-Patches/0137-Make-EnderDragon-extend-Mob.patch rename to Spigot-API-Patches/0136-Make-EnderDragon-extend-Mob.patch index d0b4e8df1c..4c25cd2e8c 100644 --- a/Spigot-API-Patches/0137-Make-EnderDragon-extend-Mob.patch +++ b/Spigot-API-Patches/0136-Make-EnderDragon-extend-Mob.patch @@ -1,11 +1,11 @@ -From beb81027a8169ef7887764eb9b28e63a251ee795 Mon Sep 17 00:00:00 2001 +From 0909253d02cf632d3abc621fa12672f8ecf42ddc Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 10 Aug 2018 22:08:34 -0400 Subject: [PATCH] Make EnderDragon extend Mob diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java -index 4ea0e44e7..fa115c091 100644 +index 4ea0e44e..fa115c09 100644 --- a/src/main/java/org/bukkit/entity/EnderDragon.java +++ b/src/main/java/org/bukkit/entity/EnderDragon.java @@ -3,7 +3,7 @@ package org.bukkit.entity; @@ -18,5 +18,5 @@ index 4ea0e44e7..fa115c091 100644 /** * Represents a phase or action that an Ender Dragon can perform. -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0138-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-API-Patches/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 90% rename from Spigot-API-Patches/0138-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to Spigot-API-Patches/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch index ead886d5e1..5f4278f16e 100644 --- a/Spigot-API-Patches/0138-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch +++ b/Spigot-API-Patches/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch @@ -1,11 +1,11 @@ -From 8999b52a5363e59c506aa4d6ab464665fed5316c Mon Sep 17 00:00:00 2001 +From 90af86c318fc39b5cdd2e146ec045e8d51b1f0d6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:04:58 -0400 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index c75bce07a..dc847340f 100644 +index c75bce07..dc847340 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -76,12 +76,24 @@ public interface Chunk { @@ -35,5 +35,5 @@ index c75bce07a..dc847340f 100644 /** * Checks if the chunk is loaded. -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0139-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/Spigot-API-Patches/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch similarity index 89% rename from Spigot-API-Patches/0139-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch rename to Spigot-API-Patches/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch index a69b9ef62d..fb16a47ecd 100644 --- a/Spigot-API-Patches/0139-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch +++ b/Spigot-API-Patches/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch @@ -1,11 +1,11 @@ -From f8ac6f3cc48002296e64c86e2c40179c672cf8ab Mon Sep 17 00:00:00 2001 +From db089bcf65dcc04d651a6f5a1efc594ffc0956eb Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:19:37 -0400 Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java -index c2c2fb838..769facd80 100644 +index c2c2fb83..769facd8 100644 --- a/src/main/java/co/aikar/timings/TimingHistory.java +++ b/src/main/java/co/aikar/timings/TimingHistory.java @@ -118,7 +118,7 @@ public class TimingHistory { @@ -18,5 +18,5 @@ index c2c2fb838..769facd80 100644 Bukkit.getLogger().warning("Null tileentity detected in chunk at position x: " + chunk.getX() + ", z: " + chunk.getZ()); continue; -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0140-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/Spigot-API-Patches/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch similarity index 96% rename from Spigot-API-Patches/0140-Allow-Blocks-to-be-accessed-via-a-long-key.patch rename to Spigot-API-Patches/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch index aafd506b90..96621a870d 100644 --- a/Spigot-API-Patches/0140-Allow-Blocks-to-be-accessed-via-a-long-key.patch +++ b/Spigot-API-Patches/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch @@ -1,4 +1,4 @@ -From 1d56359a9e09e37ab736f9188b00d5d35b2455e2 Mon Sep 17 00:00:00 2001 +From c904835beb43b6ace2281d7fc10fd90cf41b8238 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Aug 2018 21:42:10 -0700 Subject: [PATCH] Allow Blocks to be accessed via a long key @@ -18,7 +18,7 @@ Y range: [0, 1023] X, Z range: [-67 108 864, 67 108 863] diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 8dcb15fb8..7e1ee875e 100644 +index 8dcb15fb..7e1ee875 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -10,7 +10,6 @@ import org.bukkit.util.Vector; @@ -49,7 +49,7 @@ index 8dcb15fb8..7e1ee875e 100644 * @return A new location where X/Y/Z are the center of the block */ diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 724088ec0..d4bfbad33 100644 +index 724088ec..d4bfbad3 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -73,6 +73,37 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -91,7 +91,7 @@ index 724088ec0..d4bfbad33 100644 * Gets the y coordinate of the lowest block at this position such that the * block and all blocks above it are transparent for lighting purposes. diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 238de6f0a..d700df538 100644 +index 238de6f0..d700df53 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -139,6 +139,30 @@ public interface Block extends Metadatable { @@ -126,5 +126,5 @@ index 238de6f0a..d700df538 100644 * Gets the Location of the block * -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0141-Slime-Pathfinder-Events.patch b/Spigot-API-Patches/0140-Slime-Pathfinder-Events.patch similarity index 96% rename from Spigot-API-Patches/0141-Slime-Pathfinder-Events.patch rename to Spigot-API-Patches/0140-Slime-Pathfinder-Events.patch index cf9ac7f879..c7dddfbeb2 100644 --- a/Spigot-API-Patches/0141-Slime-Pathfinder-Events.patch +++ b/Spigot-API-Patches/0140-Slime-Pathfinder-Events.patch @@ -1,4 +1,4 @@ -From ff0562ebb485835ce74bede708047e3b8550562e Mon Sep 17 00:00:00 2001 +From 9525177fd2b2c81a4b586beaa0df3f4190c7fca8 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 08:18:27 -0500 Subject: [PATCH] Slime Pathfinder Events @@ -6,7 +6,7 @@ Subject: [PATCH] Slime Pathfinder Events diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java new file mode 100644 -index 000000000..f5a3ca3b0 +index 00000000..f5a3ca3b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java @@ -0,0 +1,37 @@ @@ -49,7 +49,7 @@ index 000000000..f5a3ca3b0 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java new file mode 100644 -index 000000000..356bcca8b +index 00000000..356bcca8 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java @@ -0,0 +1,49 @@ @@ -104,7 +104,7 @@ index 000000000..356bcca8b +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java new file mode 100644 -index 000000000..7c99fb538 +index 00000000..7c99fb53 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java @@ -0,0 +1,16 @@ @@ -126,7 +126,7 @@ index 000000000..7c99fb538 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java new file mode 100644 -index 000000000..7c96e3268 +index 00000000..7c96e326 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java @@ -0,0 +1,29 @@ @@ -161,7 +161,7 @@ index 000000000..7c96e3268 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java new file mode 100644 -index 000000000..e55d208c6 +index 00000000..e55d208c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java @@ -0,0 +1,16 @@ @@ -182,7 +182,7 @@ index 000000000..e55d208c6 + } +} diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java -index 1119e26e2..c4791f95d 100644 +index 1119e26e..c4791f95 100644 --- a/src/main/java/org/bukkit/entity/Slime.java +++ b/src/main/java/org/bukkit/entity/Slime.java @@ -14,4 +14,20 @@ public interface Slime extends Mob { @@ -207,5 +207,5 @@ index 1119e26e2..c4791f95d 100644 + // Paper end } -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0142-isChunkGenerated-API.patch b/Spigot-API-Patches/0141-isChunkGenerated-API.patch similarity index 94% rename from Spigot-API-Patches/0142-isChunkGenerated-API.patch rename to Spigot-API-Patches/0141-isChunkGenerated-API.patch index 5f638f319f..040c929244 100644 --- a/Spigot-API-Patches/0142-isChunkGenerated-API.patch +++ b/Spigot-API-Patches/0141-isChunkGenerated-API.patch @@ -1,4 +1,4 @@ -From 61e51bbb46ae7f2b456c903cb12cc9bebfc913bb Mon Sep 17 00:00:00 2001 +From 5ea956be59a61bc48199bc7cd85518ec81f23aee Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 19:39:46 -0700 Subject: [PATCH] isChunkGenerated API @@ -6,7 +6,7 @@ Subject: [PATCH] isChunkGenerated API Resolves #1329 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 7e1ee875e..9457832bc 100644 +index 7e1ee875..9457832b 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -9,6 +9,7 @@ import org.bukkit.util.NumberConversions; @@ -34,7 +34,7 @@ index 7e1ee875e..9457832bc 100644 /** * Sets the position of this Location and returns itself diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index d4bfbad33..53764fae6 100644 +index d4bfbad3..53764fae 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -181,6 +181,26 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -65,5 +65,5 @@ index d4bfbad33..53764fae6 100644 /** -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0143-Add-More-Creeper-API.patch b/Spigot-API-Patches/0142-Add-More-Creeper-API.patch similarity index 95% rename from Spigot-API-Patches/0143-Add-More-Creeper-API.patch rename to Spigot-API-Patches/0142-Add-More-Creeper-API.patch index 71166e9589..5ae32d8814 100644 --- a/Spigot-API-Patches/0143-Add-More-Creeper-API.patch +++ b/Spigot-API-Patches/0142-Add-More-Creeper-API.patch @@ -1,4 +1,4 @@ -From b25dc9ba524a6b2076a66d21eab0395d55c55752 Mon Sep 17 00:00:00 2001 +From 9170ad8b1b11975233995f46a677b145286c471b Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 11:50:16 -0500 Subject: [PATCH] Add More Creeper API @@ -6,7 +6,7 @@ Subject: [PATCH] Add More Creeper API diff --git a/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java new file mode 100644 -index 000000000..3d10bb039 +index 00000000..3d10bb03 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java @@ -0,0 +1,50 @@ @@ -61,7 +61,7 @@ index 000000000..3d10bb039 + } +} diff --git a/src/main/java/org/bukkit/entity/Creeper.java b/src/main/java/org/bukkit/entity/Creeper.java -index f957d8368..b9877fb88 100644 +index f957d836..b9877fb8 100644 --- a/src/main/java/org/bukkit/entity/Creeper.java +++ b/src/main/java/org/bukkit/entity/Creeper.java @@ -50,4 +50,32 @@ public interface Creeper extends Monster { @@ -98,5 +98,5 @@ index f957d8368..b9877fb88 100644 + // Paper end } -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0144-Add-PhantomPreSpawnEvent.patch b/Spigot-API-Patches/0143-Add-PhantomPreSpawnEvent.patch similarity index 93% rename from Spigot-API-Patches/0144-Add-PhantomPreSpawnEvent.patch rename to Spigot-API-Patches/0143-Add-PhantomPreSpawnEvent.patch index 00fe4c8057..a5d9d3a42f 100644 --- a/Spigot-API-Patches/0144-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-API-Patches/0143-Add-PhantomPreSpawnEvent.patch @@ -1,4 +1,4 @@ -From 512ef534b2bd22db62c872d3d95b81753846cc73 Mon Sep 17 00:00:00 2001 +From db18095b2d1d5564f7b2395ed59f548b79e50e7c Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 25 Aug 2018 19:56:42 -0500 Subject: [PATCH] Add PhantomPreSpawnEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PhantomPreSpawnEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java new file mode 100644 -index 000000000..303a1ec9b +index 00000000..303a1ec9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java @@ -0,0 +1,30 @@ @@ -41,7 +41,7 @@ index 000000000..303a1ec9b + } +} diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java -index 1a1044edc..65b703a2d 100644 +index 1a1044ed..65b703a2 100644 --- a/src/main/java/org/bukkit/entity/Phantom.java +++ b/src/main/java/org/bukkit/entity/Phantom.java @@ -14,4 +14,13 @@ public interface Phantom extends Flying { @@ -59,5 +59,5 @@ index 1a1044edc..65b703a2d 100644 + // Paper end } -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0145-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-API-Patches/0144-Add-source-block-to-BlockPhysicsEvent.patch similarity index 93% rename from Spigot-API-Patches/0145-Add-source-block-to-BlockPhysicsEvent.patch rename to Spigot-API-Patches/0144-Add-source-block-to-BlockPhysicsEvent.patch index 2c56ad9254..d5e201f603 100644 --- a/Spigot-API-Patches/0145-Add-source-block-to-BlockPhysicsEvent.patch +++ b/Spigot-API-Patches/0144-Add-source-block-to-BlockPhysicsEvent.patch @@ -1,11 +1,11 @@ -From 74550ab9a64b1084e6b69ac3bac1cfb4ad72ae60 Mon Sep 17 00:00:00 2001 +From 488d14432be0bcc7e88db13e81a1e60de0789365 Mon Sep 17 00:00:00 2001 From: Sotr Date: Thu, 23 Aug 2018 16:14:25 +0800 Subject: [PATCH] Add source block to BlockPhysicsEvent diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java -index 5e47eabe8..9d9e4712b 100644 +index 5e47eabe..9d9e4712 100644 --- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java @@ -29,10 +29,34 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable { @@ -44,5 +44,5 @@ index 5e47eabe8..9d9e4712b 100644 /** -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0146-Add-Force-Loaded-Chunk-API.patch b/Spigot-API-Patches/0145-Add-Force-Loaded-Chunk-API.patch similarity index 92% rename from Spigot-API-Patches/0146-Add-Force-Loaded-Chunk-API.patch rename to Spigot-API-Patches/0145-Add-Force-Loaded-Chunk-API.patch index 400c4d411f..24093cd88a 100644 --- a/Spigot-API-Patches/0146-Add-Force-Loaded-Chunk-API.patch +++ b/Spigot-API-Patches/0145-Add-Force-Loaded-Chunk-API.patch @@ -1,11 +1,11 @@ -From 8f9a7e82248737f63aea6b2b982d000e36a9c192 Mon Sep 17 00:00:00 2001 +From 7fcd3fcb82c1622968faa0445f9408f78bae56d7 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Wed, 29 Aug 2018 00:37:30 -0400 Subject: [PATCH] Add Force-Loaded Chunk API diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index dc847340f..51bc051f7 100644 +index dc847340..51bc051f 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -151,4 +151,20 @@ public interface Chunk { @@ -30,7 +30,7 @@ index dc847340f..51bc051f7 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 53764fae6..00b02e36f 100644 +index 53764fae..00b02e36 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -201,6 +201,16 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -51,5 +51,5 @@ index 53764fae6..00b02e36f 100644 /** -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0147-Inventory-removeItemAnySlot.patch b/Spigot-API-Patches/0146-Inventory-removeItemAnySlot.patch similarity index 94% rename from Spigot-API-Patches/0147-Inventory-removeItemAnySlot.patch rename to Spigot-API-Patches/0146-Inventory-removeItemAnySlot.patch index 6acad084be..5f0e4e1bf4 100644 --- a/Spigot-API-Patches/0147-Inventory-removeItemAnySlot.patch +++ b/Spigot-API-Patches/0146-Inventory-removeItemAnySlot.patch @@ -1,11 +1,11 @@ -From ce8c428aca9da01951b1ed86a469994d43031e29 Mon Sep 17 00:00:00 2001 +From 3f760c70899a4bd65a6c1489e7508f64b60b7339 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 28 Aug 2018 23:04:06 -0400 Subject: [PATCH] Inventory#removeItemAnySlot diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java -index 2dbba0012..ec58e9727 100644 +index 2dbba001..ec58e972 100644 --- a/src/main/java/org/bukkit/inventory/Inventory.java +++ b/src/main/java/org/bukkit/inventory/Inventory.java @@ -117,6 +117,33 @@ public interface Inventory extends Iterable { @@ -43,5 +43,5 @@ index 2dbba0012..ec58e9727 100644 * Returns all ItemStacks from the inventory * -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0148-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-API-Patches/0147-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 97% rename from Spigot-API-Patches/0148-Add-ray-tracing-methods-to-LivingEntity.patch rename to Spigot-API-Patches/0147-Add-ray-tracing-methods-to-LivingEntity.patch index 076577fd90..6d953ef55b 100644 --- a/Spigot-API-Patches/0148-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-API-Patches/0147-Add-ray-tracing-methods-to-LivingEntity.patch @@ -1,4 +1,4 @@ -From fc396d606602f2e1f574de8269db06d91b2316f7 Mon Sep 17 00:00:00 2001 +From ced5f29550020b78316bb1e18dfa359bd080a9c4 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 3 Sep 2018 18:13:53 -0500 Subject: [PATCH] Add ray tracing methods to LivingEntity @@ -6,7 +6,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java new file mode 100644 -index 000000000..fe43d9557 +index 00000000..fe43d955 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java @@ -0,0 +1,50 @@ @@ -61,7 +61,7 @@ index 000000000..fe43d9557 + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index ac5bd8a57..62e45eda2 100644 +index ac5bd8a5..62e45eda 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -71,6 +71,77 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti @@ -143,5 +143,5 @@ index ac5bd8a57..62e45eda2 100644 * Gets the last two blocks along the living entity's line of sight. *

-- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0149-Improve-death-events.patch b/Spigot-API-Patches/0148-Improve-death-events.patch similarity index 98% rename from Spigot-API-Patches/0149-Improve-death-events.patch rename to Spigot-API-Patches/0148-Improve-death-events.patch index 82a4291146..a9d0aca90c 100644 --- a/Spigot-API-Patches/0149-Improve-death-events.patch +++ b/Spigot-API-Patches/0148-Improve-death-events.patch @@ -1,4 +1,4 @@ -From 1d0ef255cb5201657f468464521c03da80ee2a63 Mon Sep 17 00:00:00 2001 +From bbd891e485ca3127eb1a6091021198f8e7f13b36 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:32:28 +0100 Subject: [PATCH] Improve death events @@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using internal code. diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java -index ab9e81fd2..a7b8f869c 100644 +index ab9e81fd..a7b8f869 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java @@ -8,10 +8,19 @@ import org.bukkit.inventory.ItemStack; @@ -173,5 +173,5 @@ index ab9e81fd2..a7b8f869c 100644 + // Paper end } -- -2.18.0 +2.19.0 diff --git a/Spigot-API-Patches/0150-Mob-Pathfinding-API.patch b/Spigot-API-Patches/0149-Mob-Pathfinding-API.patch similarity index 98% rename from Spigot-API-Patches/0150-Mob-Pathfinding-API.patch rename to Spigot-API-Patches/0149-Mob-Pathfinding-API.patch index 63bdf8baba..1262cf8916 100644 --- a/Spigot-API-Patches/0150-Mob-Pathfinding-API.patch +++ b/Spigot-API-Patches/0149-Mob-Pathfinding-API.patch @@ -1,4 +1,4 @@ -From 89a06baab04317f850f553f044a6fba5e35388ad Mon Sep 17 00:00:00 2001 +From 8441b5c4cf5d6774d9c65a809bcd6480a760d668 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 12:39:06 -0400 Subject: [PATCH] Mob Pathfinding API @@ -13,7 +13,7 @@ You can use EntityPathfindEvent to cancel new pathfinds from overriding your cur diff --git a/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java new file mode 100644 -index 000000000..d6953b390 +index 00000000..d6953b39 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java @@ -0,0 +1,167 @@ @@ -185,7 +185,7 @@ index 000000000..d6953b390 + } +} diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index d029d34ea..48eddcd30 100644 +index d029d34e..48eddcd3 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java @@ -7,6 +7,14 @@ import org.bukkit.loot.Lootable; @@ -204,5 +204,5 @@ index d029d34ea..48eddcd30 100644 * Instructs this Mob to set the specified LivingEntity as its target. *

-- -2.18.0 +2.19.0