diff --git a/Spigot-API-Patches/0003-Paper-Utils.patch b/Spigot-API-Patches/0003-Paper-Utils.patch new file mode 100644 index 0000000000..661b5e6a6b --- /dev/null +++ b/Spigot-API-Patches/0003-Paper-Utils.patch @@ -0,0 +1,29 @@ +From d7927f758fcbaeb1c2bf4fa4debed90eb6f04991 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Sat, 23 Feb 2019 11:26:21 -0500 +Subject: [PATCH] Paper Utils + + +diff --git a/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java +new file mode 100644 +index 00000000..e5850967 +--- /dev/null ++++ b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java +@@ -0,0 +1,14 @@ ++package com.destroystokyo.paper.util; ++ ++public class SneakyThrow { ++ ++ public static void sneaky(Throwable exception) { ++ SneakyThrow.throwSneaky(exception); ++ } ++ ++ @SuppressWarnings("unchecked") ++ private static void throwSneaky(Throwable exception) throws T { ++ throw (T) exception; ++ } ++ ++} +-- +2.20.1 + diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0004-Timings-v2.patch similarity index 99% rename from Spigot-API-Patches/0003-Timings-v2.patch rename to Spigot-API-Patches/0004-Timings-v2.patch index 5cfb6b88c7..70756ff530 100644 --- a/Spigot-API-Patches/0003-Timings-v2.patch +++ b/Spigot-API-Patches/0004-Timings-v2.patch @@ -1,4 +1,4 @@ -From c4e6bfe0af9a90f66cf6685af9e00d904a817b2d Mon Sep 17 00:00:00 2001 +From 3bb80307cfe675a18922158a1d2b1427e334a27b Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 diff --git a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch similarity index 94% rename from Spigot-API-Patches/0004-Player-affects-spawning-API.patch rename to Spigot-API-Patches/0005-Player-affects-spawning-API.patch index cc8d945593..3d616c3482 100644 --- a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch +++ b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From 7ca40bb76fccf892bb8ead4ba9433e5914e8d693 Mon Sep 17 00:00:00 2001 +From 44c7da0daea1759a7b45d8e5393ca84216ed9c0a Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Mon, 29 Feb 2016 17:22:34 -0600 Subject: [PATCH] Player affects spawning API diff --git a/Spigot-API-Patches/0005-Add-getTPS-method.patch b/Spigot-API-Patches/0006-Add-getTPS-method.patch similarity index 90% rename from Spigot-API-Patches/0005-Add-getTPS-method.patch rename to Spigot-API-Patches/0006-Add-getTPS-method.patch index c1c3426bff..3294374e51 100644 --- a/Spigot-API-Patches/0005-Add-getTPS-method.patch +++ b/Spigot-API-Patches/0006-Add-getTPS-method.patch @@ -1,11 +1,11 @@ -From 2d46f80ca7111d829da20a036e72c27aaa6cd253 Mon Sep 17 00:00:00 2001 +From 55f158cbeaa2938c3bc32d50ddd023ab6a172f67 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 17:24:57 -0600 Subject: [PATCH] Add getTPS method diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 52ce3cd4..8a6529f3 100644 +index 14e425d1..6055c801 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1274,6 +1274,16 @@ public final class Bukkit { @@ -26,7 +26,7 @@ index 52ce3cd4..8a6529f3 100644 * Get the advancement specified by this key. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 6572f3ac..9651a45c 100644 +index 9d2326ca..1632af18 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1056,6 +1056,15 @@ public interface Server extends PluginMessageRecipient { diff --git a/Spigot-API-Patches/0006-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch similarity index 97% rename from Spigot-API-Patches/0006-Entity-Origin-API.patch rename to Spigot-API-Patches/0007-Entity-Origin-API.patch index 8cc78b503b..82fce96a5d 100644 --- a/Spigot-API-Patches/0006-Entity-Origin-API.patch +++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch @@ -1,4 +1,4 @@ -From 37ea574289bb7d3eaae4045a22c9bbc07ecd7672 Mon Sep 17 00:00:00 2001 +From ac7b32c1796b75c604e78cde4e691fbf4611df50 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 17:50:31 -0600 Subject: [PATCH] Entity Origin API diff --git a/Spigot-API-Patches/0007-Check-Paper-versions.patch b/Spigot-API-Patches/0008-Check-Paper-versions.patch similarity index 98% rename from Spigot-API-Patches/0007-Check-Paper-versions.patch rename to Spigot-API-Patches/0008-Check-Paper-versions.patch index 65cde94c84..7ed92d4c05 100644 --- a/Spigot-API-Patches/0007-Check-Paper-versions.patch +++ b/Spigot-API-Patches/0008-Check-Paper-versions.patch @@ -1,11 +1,11 @@ -From 121fabf8e1502b935c8d3f94635247b6d369de24 Mon Sep 17 00:00:00 2001 +From 33f3804404e0c186f8cf33f8f3a226e0d84b7dfc 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 5a994953b..f38f68640 100644 +index 5a994953..f38f6864 100644 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java @@ -26,6 +26,11 @@ import org.json.simple.JSONObject; @@ -147,5 +147,5 @@ index 5a994953b..f38f68640 100644 + // Paper end } -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0008-Add-PlayerLocaleChangeEvent.patch b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch similarity index 96% rename from Spigot-API-Patches/0008-Add-PlayerLocaleChangeEvent.patch rename to Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch index 3a2ee3bbf6..fcdbac30b6 100644 --- a/Spigot-API-Patches/0008-Add-PlayerLocaleChangeEvent.patch +++ b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch @@ -1,4 +1,4 @@ -From 6a8a468f3a3b613765b95dea08c1a426bf7cc379 Mon Sep 17 00:00:00 2001 +From 4a87891b85650f57eb21334774f829ae8ba4c5e0 Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Mon, 29 Feb 2016 18:02:25 -0600 Subject: [PATCH] Add PlayerLocaleChangeEvent diff --git a/Spigot-API-Patches/0009-Add-player-view-distance-API.patch b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch similarity index 93% rename from Spigot-API-Patches/0009-Add-player-view-distance-API.patch rename to Spigot-API-Patches/0010-Add-player-view-distance-API.patch index 2215a91864..effe07fde2 100644 --- a/Spigot-API-Patches/0009-Add-player-view-distance-API.patch +++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch @@ -1,4 +1,4 @@ -From 5909d262fd56ae7bbc35af5e26f109f8c60a17a1 Mon Sep 17 00:00:00 2001 +From e802df27e5944819165eb81c78b5c6e4842a15dd Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 18:05:37 -0600 Subject: [PATCH] Add player view distance API diff --git a/Spigot-API-Patches/0010-Add-BeaconEffectEvent.patch b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch similarity index 96% rename from Spigot-API-Patches/0010-Add-BeaconEffectEvent.patch rename to Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch index f214a0e8a7..4b63a3b880 100644 --- a/Spigot-API-Patches/0010-Add-BeaconEffectEvent.patch +++ b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch @@ -1,4 +1,4 @@ -From b0d2313841c2f617773d33708aaca8fece34d75c Mon Sep 17 00:00:00 2001 +From 41cb3feff77a6e684cefbc546f48245294a2d978 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 18:09:40 -0600 Subject: [PATCH] Add BeaconEffectEvent @@ -92,5 +92,5 @@ index 00000000..6579ae99 + } +} -- -2.17.0 (Apple Git-106) +2.20.1 diff --git a/Spigot-API-Patches/0011-Add-PlayerInitialSpawnEvent.patch b/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch similarity index 95% rename from Spigot-API-Patches/0011-Add-PlayerInitialSpawnEvent.patch rename to Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch index f7df8de7fc..a712cb014a 100644 --- a/Spigot-API-Patches/0011-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch @@ -1,4 +1,4 @@ -From facd6dc1bbfc8a8f13398666f37d86892ce761cc Mon Sep 17 00:00:00 2001 +From 31ed8767255c5f82dbb149e44a080e17a52d7f29 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Mon, 29 Feb 2016 18:13:58 -0600 Subject: [PATCH] Add PlayerInitialSpawnEvent @@ -55,5 +55,5 @@ index 00000000..d1d6f33c + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0012-Automatically-disable-plugins-that-fail-to-load.patch b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch similarity index 94% rename from Spigot-API-Patches/0012-Automatically-disable-plugins-that-fail-to-load.patch rename to Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch index 0ed3a135b6..b869efe76b 100644 --- a/Spigot-API-Patches/0012-Automatically-disable-plugins-that-fail-to-load.patch +++ b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch @@ -1,4 +1,4 @@ -From b45f9dba0fc2d0d9839d30d4724b86047a8a9e2a Mon Sep 17 00:00:00 2001 +From 022b86144f12f59ec72a1d51aa364d1dfecd590f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 19:45:21 -0600 Subject: [PATCH] Automatically disable plugins that fail to load diff --git a/Spigot-API-Patches/0013-Expose-server-CommandMap.patch b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch similarity index 95% rename from Spigot-API-Patches/0013-Expose-server-CommandMap.patch rename to Spigot-API-Patches/0014-Expose-server-CommandMap.patch index f931fb82e9..a5856c7e83 100644 --- a/Spigot-API-Patches/0013-Expose-server-CommandMap.patch +++ b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch @@ -1,4 +1,4 @@ -From 1aea2e6ad04b50f18e972f4b30a3f2855b6108eb Mon Sep 17 00:00:00 2001 +From 1810c82d5d0939592b9bd28dff43af08b9913578 Mon Sep 17 00:00:00 2001 From: kashike Date: Mon, 29 Feb 2016 19:48:59 -0600 Subject: [PATCH] Expose server CommandMap diff --git a/Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch similarity index 96% rename from Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch rename to Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index a438512762..38e38f9709 100644 --- a/Spigot-API-Patches/0014-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -1,4 +1,4 @@ -From 70541080fa91240503bba54632ebddfba554c439 Mon Sep 17 00:00:00 2001 +From fb9cdc4061e67e97aa4bb394408fa0ed58d5980d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 19:54:32 -0600 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses @@ -6,7 +6,7 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses Change Javadoc to be accurate diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index d4b7c539..f14339af 100644 +index cb7dc068..22704949 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -289,6 +289,26 @@ public final class Bukkit { @@ -37,7 +37,7 @@ index d4b7c539..f14339af 100644 * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index b9a75b2d..ce369aa3 100644 +index c4dc1de2..f4f4f291 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -237,6 +237,26 @@ public interface Server extends PluginMessageRecipient { diff --git a/Spigot-API-Patches/0015-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch similarity index 99% rename from Spigot-API-Patches/0015-Player-Tab-List-and-Title-APIs.patch rename to Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch index c16720a368..684a07af8d 100644 --- a/Spigot-API-Patches/0015-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From 5ce4dce9f8fb84d51fb88716b3d48ae1ba77e9ce Mon Sep 17 00:00:00 2001 +From 4a3c14108319be72d10d723765208489faeade93 Mon Sep 17 00:00:00 2001 From: Techcable Date: Mon, 29 Feb 2016 20:02:40 -0600 Subject: [PATCH] Player Tab List and Title APIs @@ -6,7 +6,7 @@ Subject: [PATCH] Player Tab List and Title APIs diff --git a/src/main/java/com/destroystokyo/paper/Title.java b/src/main/java/com/destroystokyo/paper/Title.java new file mode 100644 -index 000000000..3c2b63db4 +index 00000000..3c2b63db --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/Title.java @@ -0,0 +1,358 @@ @@ -369,7 +369,7 @@ index 000000000..3c2b63db4 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index fc2d4da89..b57b6981d 100644 +index bf86eb67..959add05 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -2,6 +2,7 @@ package org.bukkit.entity; @@ -498,5 +498,5 @@ index fc2d4da89..b57b6981d 100644 /** -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0016-Add-exception-reporting-event.patch b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch similarity index 99% rename from Spigot-API-Patches/0016-Add-exception-reporting-event.patch rename to Spigot-API-Patches/0017-Add-exception-reporting-event.patch index b6b0164496..41ac375c81 100644 --- a/Spigot-API-Patches/0016-Add-exception-reporting-event.patch +++ b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From 89163d1e8bdffcb4edd56ad2285ce58bf5852f01 Mon Sep 17 00:00:00 2001 +From e2ae8da9f75fcb1125eb4b5d155f87c10402abdc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:24:35 -0600 Subject: [PATCH] Add exception reporting event diff --git a/Spigot-API-Patches/0017-Fix-ServerListPingEvent-flagging-as-Async.patch b/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch similarity index 96% rename from Spigot-API-Patches/0017-Fix-ServerListPingEvent-flagging-as-Async.patch rename to Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch index 9f65d69461..4888311280 100644 --- a/Spigot-API-Patches/0017-Fix-ServerListPingEvent-flagging-as-Async.patch +++ b/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch @@ -1,4 +1,4 @@ -From cb1afe86f6ab48949d4e19d3549a4669b1ceae28 Mon Sep 17 00:00:00 2001 +From 53967b181e239d26686641531567dd5ca810eaef Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 20:26:39 -0600 Subject: [PATCH] Fix ServerListPingEvent flagging as Async @@ -50,5 +50,5 @@ index 343f238f..3c38d857 100644 this.address = address; this.motd = motd; -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0018-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch similarity index 94% rename from Spigot-API-Patches/0018-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch rename to Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch index ef22184a8e..99a97e74c3 100644 --- a/Spigot-API-Patches/0018-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch +++ b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch @@ -1,11 +1,11 @@ -From 4f2293cad7b7ebfdea3f2d98d6de482f59bc9fff Mon Sep 17 00:00:00 2001 +From 325fb41de3f83292cb643328dca9fe1cf88a4285 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 8 Mar 2016 13:05:59 -0800 Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java -index abf68a2c7..fcb03b830 100644 +index abf68a2c..fcb03b83 100644 --- a/src/main/java/org/bukkit/command/CommandSender.java +++ b/src/main/java/org/bukkit/command/CommandSender.java @@ -58,4 +58,30 @@ public interface CommandSender extends Permissible { @@ -40,7 +40,7 @@ index abf68a2c7..fcb03b830 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index b57b6981d..2096656ee 100644 +index 959add05..5109a0c3 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -421,6 +421,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -60,5 +60,5 @@ index b57b6981d..2096656ee 100644 spigot().sendMessage(components); } -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 89% rename from Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 092f54b670..f78051bfa9 100644 --- a/Spigot-API-Patches/0019-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,11 +1,11 @@ -From 6608ee077047ceaa21424db91fcc3140555ac72c Mon Sep 17 00:00:00 2001 +From b7ed9b6398099edd1abbd197e97f6ccd0f3bf446 Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:47:27 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 8cf98673d..f67711fd7 100644 +index 8cf98673..f67711fd 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -453,4 +453,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -29,5 +29,5 @@ index 8cf98673d..f67711fd7 100644 + // Paper end } -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0020-Complete-resource-pack-API.patch b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch similarity index 98% rename from Spigot-API-Patches/0020-Complete-resource-pack-API.patch rename to Spigot-API-Patches/0021-Complete-resource-pack-API.patch index 7ee943d62c..26db8c91c6 100644 --- a/Spigot-API-Patches/0020-Complete-resource-pack-API.patch +++ b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch @@ -1,4 +1,4 @@ -From bb7b7a5e39dd260604c73a219f275c3982f012a3 Mon Sep 17 00:00:00 2001 +From 84cb83edc3529a5d89c634cf92d88e36ea7b051a Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 22:59:54 -0400 Subject: [PATCH] Complete resource pack API diff --git a/Spigot-API-Patches/0021-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch similarity index 94% rename from Spigot-API-Patches/0021-Use-ASM-for-event-executors.patch rename to Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch index 6a841d0dd0..da02c0758f 100644 --- a/Spigot-API-Patches/0021-Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch @@ -1,4 +1,4 @@ -From dd5c7d73e74b48760f58cee1810cb23f3c9a4352 Mon Sep 17 00:00:00 2001 +From c3ff7d3fbb2e568bfc8c25a3c3f0857e73c2c184 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 13:20:33 -0700 Subject: [PATCH] Use ASM for event executors. @@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/pom.xml b/pom.xml -index f8f12595b..84ba2076f 100644 +index f8f12595..84ba2076 100644 --- a/pom.xml +++ b/pom.xml @@ -116,6 +116,17 @@ @@ -29,7 +29,7 @@ index f8f12595b..84ba2076f 100644 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java new file mode 100644 -index 000000000..9ff99e3b3 +index 00000000..9ff99e3b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java @@ -0,0 +1,40 @@ @@ -75,10 +75,10 @@ index 000000000..9ff99e3b3 +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java new file mode 100644 -index 000000000..f60f01005 +index 00000000..bac04fd8 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java -@@ -0,0 +1,39 @@ +@@ -0,0 +1,41 @@ +package com.destroystokyo.paper.event.executor; + +import java.lang.invoke.MethodHandle; @@ -86,8 +86,10 @@ index 000000000..f60f01005 +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; + ++import com.destroystokyo.paper.util.SneakyThrow; +import com.google.common.base.Preconditions; + ++import org.bukkit.Bukkit; +import org.bukkit.event.Event; +import org.bukkit.event.EventException; +import org.bukkit.event.Listener; @@ -113,14 +115,14 @@ index 000000000..f60f01005 + if (!eventClass.isInstance(event)) return; + try { + handle.invoke(event); -+ } catch (Throwable t) { -+ throw new EventException(t); ++ } catch (Throwable throwable) { ++ SneakyThrow.sneaky(throwable); + } + } +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java new file mode 100644 -index 000000000..140cf0ad3 +index 00000000..140cf0ad --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java @@ -0,0 +1,44 @@ @@ -170,7 +172,7 @@ index 000000000..140cf0ad3 +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java new file mode 100644 -index 000000000..6941d9fbf +index 00000000..6941d9fb --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java @@ -0,0 +1,32 @@ @@ -208,7 +210,7 @@ index 000000000..6941d9fbf +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java new file mode 100644 -index 000000000..1473ff8cd +index 00000000..1473ff8c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java @@ -0,0 +1,63 @@ @@ -277,7 +279,7 @@ index 000000000..1473ff8cd +} diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java new file mode 100644 -index 000000000..62acbf821 +index 00000000..62acbf82 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java @@ -0,0 +1,33 @@ @@ -315,10 +317,10 @@ index 000000000..62acbf821 + } +} diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java -index 3b2c99ea7..b45b6c1c3 100644 +index 3b2c99ea..b11c6ce6 100644 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java -@@ -4,9 +4,81 @@ import org.bukkit.event.Event; +@@ -4,9 +4,74 @@ import org.bukkit.event.Event; import org.bukkit.event.EventException; import org.bukkit.event.Listener; @@ -380,16 +382,9 @@ index 3b2c99ea7..b45b6c1c3 100644 + try { + EventExecutor asmExecutor = executorClass.newInstance(); + // Define a wrapper to conform to bukkit stupidity (passing in events that don't match and wrapper exception) -+ return new EventExecutor() { -+ @Override -+ public void execute(Listener listener, Event event) throws EventException { -+ if (!eventClass.isInstance(event)) return; -+ try { -+ asmExecutor.execute(listener, event); -+ } catch (Exception e) { -+ throw new EventException(e); -+ } -+ } ++ return (listener, event) -> { ++ if (!eventClass.isInstance(event)) return; ++ asmExecutor.execute(listener, event); + }; + } catch (InstantiationException | IllegalAccessException e) { + throw new AssertionError("Unable to initialize generated event executor", e); @@ -401,7 +396,7 @@ index 3b2c99ea7..b45b6c1c3 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index bf9723029..77207f147 100644 +index bf972302..77207f14 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -290,20 +290,7 @@ public final class JavaPluginLoader implements PluginLoader { diff --git a/Spigot-API-Patches/0022-Add-a-call-helper-to-Event.patch b/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch similarity index 94% rename from Spigot-API-Patches/0022-Add-a-call-helper-to-Event.patch rename to Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch index 5c9f4f75c3..b67d54a1e8 100644 --- a/Spigot-API-Patches/0022-Add-a-call-helper-to-Event.patch +++ b/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch @@ -1,4 +1,4 @@ -From b6c1b5a967f036414fecc13493846b18a6c60ffe Mon Sep 17 00:00:00 2001 +From 39a9d269c567db7d72040f7bd62befb4c4a09482 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 May 2013 20:36:58 -0400 Subject: [PATCH] Add a call helper to Event @@ -40,5 +40,5 @@ index 6677e1bd..e7061112 100644 * Convenience method for providing a user-friendly identifier. By * default, it is the event's class's {@linkplain Class#getSimpleName() -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0023-Add-sender-name-to-commands.yml-replacement.patch b/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch similarity index 96% rename from Spigot-API-Patches/0023-Add-sender-name-to-commands.yml-replacement.patch rename to Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch index 23e445bc80..8406b7b8b4 100644 --- a/Spigot-API-Patches/0023-Add-sender-name-to-commands.yml-replacement.patch +++ b/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch @@ -1,4 +1,4 @@ -From 77a78428fcc16fb82c0a2e0d2173db22a1476266 Mon Sep 17 00:00:00 2001 +From 01aa5305d302cfcdfdd2fb0ba3726cf5f3e7f8cd Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 22 Jul 2015 18:50:41 -0400 Subject: [PATCH] Add sender name to commands.yml replacement @@ -42,5 +42,5 @@ index 9c80f464..631be1cb 100644 while (index != -1) { int start = index; -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0024-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch similarity index 98% rename from Spigot-API-Patches/0024-Add-command-to-reload-permissions.yml-and-require-co.patch rename to Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch index 0304c19434..a6c93beaf5 100644 --- a/Spigot-API-Patches/0024-Add-command-to-reload-permissions.yml-and-require-co.patch +++ b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch @@ -1,4 +1,4 @@ -From 04ea5b0483635c527ce9f0c79508b1f173e020c8 Mon Sep 17 00:00:00 2001 +From 0e952a407295877a6c5dd1afc482fc75ef8ba8f9 Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:28:07 -0400 Subject: [PATCH] Add command to reload permissions.yml and require confirm to diff --git a/Spigot-API-Patches/0025-Custom-replacement-for-eaten-items.patch b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch similarity index 96% rename from Spigot-API-Patches/0025-Custom-replacement-for-eaten-items.patch rename to Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch index aa5d96f386..f865d52404 100644 --- a/Spigot-API-Patches/0025-Custom-replacement-for-eaten-items.patch +++ b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch @@ -1,4 +1,4 @@ -From 9b4d4b26e75b1e6467c11da7432ba08453689686 Mon Sep 17 00:00:00 2001 +From ecd8d3e4642c78e5943717aed64df470aa7f83c9 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:05:21 -0400 Subject: [PATCH] Custom replacement for eaten items @@ -56,5 +56,5 @@ index 8ab76b1d..7d28155b 100644 return this.isCancelled; } -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0026-Access-items-by-EquipmentSlot.patch b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch similarity index 93% rename from Spigot-API-Patches/0026-Access-items-by-EquipmentSlot.patch rename to Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch index 4dec881db2..3d4e37b8c7 100644 --- a/Spigot-API-Patches/0026-Access-items-by-EquipmentSlot.patch +++ b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch @@ -1,4 +1,4 @@ -From a7dfaaafcec3d730d94bbb597f2070accb79bf76 Mon Sep 17 00:00:00 2001 +From 1d864e4056e3e6dbfbdc8675781c0310b9215925 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 20 Mar 2016 06:44:49 -0400 Subject: [PATCH] Access items by EquipmentSlot @@ -32,5 +32,5 @@ index fc5772e8..d56f6e00 100644 + // Paper end } -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0027-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 96% rename from Spigot-API-Patches/0027-Entity-AddTo-RemoveFrom-World-Events.patch rename to Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch index 3ad2bfe7b3..a77334e951 100644 --- a/Spigot-API-Patches/0027-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,4 +1,4 @@ -From db294a56ff3cbb40493caea0ce0506dc6261de4d Mon Sep 17 00:00:00 2001 +From 317c71255861fe7a849577db4f289473425bd0d6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:26:34 -0400 Subject: [PATCH] Entity AddTo/RemoveFrom World Events @@ -72,5 +72,5 @@ index 00000000..800be6aa + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0028-EntityPathfindEvent.patch b/Spigot-API-Patches/0029-EntityPathfindEvent.patch similarity index 97% rename from Spigot-API-Patches/0028-EntityPathfindEvent.patch rename to Spigot-API-Patches/0029-EntityPathfindEvent.patch index efa6f26612..78b69ec3b5 100644 --- a/Spigot-API-Patches/0028-EntityPathfindEvent.patch +++ b/Spigot-API-Patches/0029-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From 0f4f69d6a81d66c4906f1c05cac664bbdb129cf7 Mon Sep 17 00:00:00 2001 +From b9ed451873b6f1026308d423f636604f07fcf31c Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 21:15:34 -0400 Subject: [PATCH] EntityPathfindEvent @@ -86,5 +86,5 @@ index 00000000..0e4902d9 + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0029-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch similarity index 98% rename from Spigot-API-Patches/0029-Reduce-thread-synchronization-in-MetadataStoreBase.patch rename to Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch index 73c734e753..dfdb525daf 100644 --- a/Spigot-API-Patches/0029-Reduce-thread-synchronization-in-MetadataStoreBase.patch +++ b/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch @@ -1,4 +1,4 @@ -From 9cd7b0f5a8832c7d1b3db973c9f65db555013762 Mon Sep 17 00:00:00 2001 +From 6c27ed542ca4cd73af3d8ae98f29511c827003f3 Mon Sep 17 00:00:00 2001 From: crast Date: Sat, 1 Jun 2013 13:52:30 -0600 Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase @@ -101,5 +101,5 @@ index 093c1445..64c0f0a7 100644 for (Map values : metadataMap.values()) { if (values.containsKey(owningPlugin)) { -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0030-Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch similarity index 95% rename from Spigot-API-Patches/0030-Add-MetadataStoreBase.removeAll-Plugin.patch rename to Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch index 10497f7511..62ea7f24a7 100644 --- a/Spigot-API-Patches/0030-Add-MetadataStoreBase.removeAll-Plugin.patch +++ b/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch @@ -1,4 +1,4 @@ -From 9a9ae4bff73c2649084dc753efa60f86ac91c2dd Mon Sep 17 00:00:00 2001 +From 28cef08075786587ecc702ad3dab4bc06d3ce624 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 16 Jul 2013 21:26:50 -0400 Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin) @@ -37,5 +37,5 @@ index 64c0f0a7..6da6abd8 100644 * Creates a unique name for the object receiving metadata by combining * unique data from the subject with a metadataKey. -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0031-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch similarity index 95% rename from Spigot-API-Patches/0031-Add-PlayerUseUnknownEntityEvent.patch rename to Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch index f922ed959b..e7f9b3070d 100644 --- a/Spigot-API-Patches/0031-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch @@ -1,4 +1,4 @@ -From 57f2ba957f3cf3753fdf4f51697cda7e52daefc7 Mon Sep 17 00:00:00 2001 +From 0e2bcd42ff189af6160bf962e5c8371b067d9cd9 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 05:08:36 -0400 Subject: [PATCH] Add PlayerUseUnknownEntityEvent @@ -53,5 +53,5 @@ index 00000000..70eeaf5c + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0032-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 98% rename from Spigot-API-Patches/0032-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch index 9f032fd056..40c9577fd9 100644 --- a/Spigot-API-Patches/0032-Add-handshake-event-to-allow-plugins-to-handle-clien.patch +++ b/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch @@ -1,4 +1,4 @@ -From ee3ad1b0cf85252211cdb2811557bfb7da695370 Mon Sep 17 00:00:00 2001 +From 9cab068579819105524d58de846e54b9a4050bb2 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 @@ -223,5 +223,5 @@ index 00000000..e44d03a2 + } +} -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0033-Arrow-pickup-rule-API.patch b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch similarity index 96% rename from Spigot-API-Patches/0033-Arrow-pickup-rule-API.patch rename to Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch index fa8250cdb2..00ef787774 100644 --- a/Spigot-API-Patches/0033-Arrow-pickup-rule-API.patch +++ b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch @@ -1,4 +1,4 @@ -From e711715c7ddc2a309bbcb0156ab188fb95fddd32 Mon Sep 17 00:00:00 2001 +From 14622209c86028ac63d81543497dfa48290ba377 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/Spigot-API-Patches/0034-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 93% rename from Spigot-API-Patches/0034-EntityRegainHealthEvent-isFastRegen-API.patch rename to Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch index d3f1e2e967..f383a3a4bb 100644 --- a/Spigot-API-Patches/0034-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,11 +1,11 @@ -From 230d52bcaba8bbb8dafe803bb5fb6b26554abb1e Mon Sep 17 00:00:00 2001 +From 927a3bee043bc15d1c0c0f60be3e4afb3f440ab6 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 976b80b7e..a5ac3edf3 100644 +index 976b80b7..a5ac3edf 100644 --- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java @@ -12,12 +12,31 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable @@ -41,5 +41,5 @@ index 976b80b7e..a5ac3edf3 100644 /** * Gets the amount of regained health -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0035-LootTable-API.patch b/Spigot-API-Patches/0036-LootTable-API.patch similarity index 96% rename from Spigot-API-Patches/0035-LootTable-API.patch rename to Spigot-API-Patches/0036-LootTable-API.patch index 0b5b027c4e..9cb37f08a5 100644 --- a/Spigot-API-Patches/0035-LootTable-API.patch +++ b/Spigot-API-Patches/0036-LootTable-API.patch @@ -1,4 +1,4 @@ -From d1fe144a1457bb44d3e453bf5add1a93aea47d4a Mon Sep 17 00:00:00 2001 +From 8c74a2e04e4a744068d564312cd647bc53898a59 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/LootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java new file mode 100644 -index 000000000..9095df616 +index 00000000..9095df61 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java @@ -0,0 +1,15 @@ @@ -33,7 +33,7 @@ index 000000000..9095df616 +} 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 000000000..a389f74c6 +index 00000000..a389f74c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java @@ -0,0 +1,15 @@ @@ -54,7 +54,7 @@ index 000000000..a389f74c6 +} 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 000000000..2fc3e8a1c +index 00000000..2fc3e8a1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java @@ -0,0 +1,112 @@ @@ -172,7 +172,7 @@ index 000000000..2fc3e8a1c +} 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 000000000..2169493d9 +index 00000000..2169493d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java @@ -0,0 +1,41 @@ @@ -218,7 +218,7 @@ index 000000000..2169493d9 + } +} diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java -index 815d79a53..b68ab881d 100644 +index 815d79a5..b68ab881 100644 --- a/src/main/java/org/bukkit/block/Chest.java +++ b/src/main/java/org/bukkit/block/Chest.java @@ -1,5 +1,6 @@ @@ -238,7 +238,7 @@ index 815d79a53..b68ab881d 100644 /** * Gets the inventory of the chest block represented by this block state. diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java -index 2741625db..6d180117e 100644 +index 2741625d..6d180117 100644 --- a/src/main/java/org/bukkit/block/Dispenser.java +++ b/src/main/java/org/bukkit/block/Dispenser.java @@ -1,5 +1,6 @@ @@ -258,7 +258,7 @@ index 2741625db..6d180117e 100644 /** * Gets the BlockProjectileSource object for the dispenser. diff --git a/src/main/java/org/bukkit/block/Dropper.java b/src/main/java/org/bukkit/block/Dropper.java -index 2e8c3f711..47737b590 100644 +index 2e8c3f71..47737b59 100644 --- a/src/main/java/org/bukkit/block/Dropper.java +++ b/src/main/java/org/bukkit/block/Dropper.java @@ -1,12 +1,13 @@ @@ -277,7 +277,7 @@ index 2e8c3f711..47737b590 100644 /** * Tries to drop a randomly selected item from the dropper's inventory, diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java -index 73fce5f33..221123e8c 100644 +index 73fce5f3..221123e8 100644 --- a/src/main/java/org/bukkit/block/Hopper.java +++ b/src/main/java/org/bukkit/block/Hopper.java @@ -1,9 +1,10 @@ @@ -293,7 +293,7 @@ index 73fce5f33..221123e8c 100644 -public interface Hopper extends Container, Nameable, Lootable { } +public interface Hopper extends Container, Nameable, LootableBlockInventory { } // Paper diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java -index 8e061e4a4..1c02c6e1c 100644 +index 8e061e4a..1c02c6e1 100644 --- a/src/main/java/org/bukkit/block/ShulkerBox.java +++ b/src/main/java/org/bukkit/block/ShulkerBox.java @@ -1,5 +1,6 @@ @@ -313,7 +313,7 @@ index 8e061e4a4..1c02c6e1c 100644 /** * Get the {@link DyeColor} corresponding to this ShulkerBox diff --git a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java -index 8ced54039..865885501 100644 +index 8ced5403..86588550 100644 --- a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java +++ b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java @@ -1,5 +1,6 @@ @@ -333,7 +333,7 @@ index 8ced54039..865885501 100644 /** * Checks whether or not this Minecart will pick up diff --git a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java -index 9ea403e6f..238d118f7 100644 +index 9ea403e6..238d118f 100644 --- a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java +++ b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java @@ -1,5 +1,6 @@ @@ -351,7 +351,7 @@ index 9ea403e6f..238d118f7 100644 +public interface StorageMinecart extends Minecart, InventoryHolder, LootableEntityInventory { // Paper } diff --git a/src/main/java/org/bukkit/loot/Lootable.java b/src/main/java/org/bukkit/loot/Lootable.java -index f4b3d0215..9f1c830f4 100644 +index f4b3d021..9f1c830f 100644 --- a/src/main/java/org/bukkit/loot/Lootable.java +++ b/src/main/java/org/bukkit/loot/Lootable.java @@ -33,6 +33,34 @@ public interface Lootable { @@ -390,5 +390,5 @@ index f4b3d0215..9f1c830f4 100644 * Set the seed used when this Loot Table generates loot. * -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0036-Add-EntityZapEvent.patch b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch similarity index 98% rename from Spigot-API-Patches/0036-Add-EntityZapEvent.patch rename to Spigot-API-Patches/0037-Add-EntityZapEvent.patch index 06b340d8dc..415defa0b9 100644 --- a/Spigot-API-Patches/0036-Add-EntityZapEvent.patch +++ b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From 2527eb4a36c059f3c42f5fc5dbac73c6021c6d10 Mon Sep 17 00:00:00 2001 +From a520009d4480e4b49846a57681d065a651c45419 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:34 -0700 Subject: [PATCH] Add EntityZapEvent @@ -120,5 +120,5 @@ index c1d4b30a..de8cad81 100644 + // Paper end } -- -2.19.2 +2.20.1 diff --git a/Spigot-API-Patches/0037-Misc-Utils.patch b/Spigot-API-Patches/0038-Misc-Utils.patch similarity index 94% rename from Spigot-API-Patches/0037-Misc-Utils.patch rename to Spigot-API-Patches/0038-Misc-Utils.patch index 3dd8d2ab46..69a3659239 100644 --- a/Spigot-API-Patches/0037-Misc-Utils.patch +++ b/Spigot-API-Patches/0038-Misc-Utils.patch @@ -1,4 +1,4 @@ -From f3a8ebcad45891f6cb7d243095d3739c1f1980d2 Mon Sep 17 00:00:00 2001 +From 3fabac75e83331f5b4ac0cefaa42b16441a2956e Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 12:53:43 -0500 Subject: [PATCH] Misc Utils @@ -42,5 +42,5 @@ index 00000000..d60ecbb1 + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch similarity index 98% rename from Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch rename to Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch index 1da244b244..b26f3d8b1e 100644 --- a/Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From 305f8749b7972506665be9ad41cdaa5fb020e60f Mon Sep 17 00:00:00 2001 +From a7f30eb6aff66658a5731d0ee906374a2a823788 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 diff --git a/Spigot-API-Patches/0039-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch similarity index 95% rename from Spigot-API-Patches/0039-Add-source-to-PlayerExpChangeEvent.patch rename to Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch index 969451283b..38d1648a0b 100644 --- a/Spigot-API-Patches/0039-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch @@ -1,4 +1,4 @@ -From 47a6be4ee58f0b7650ee3f74933311d0e0dbab0e Mon Sep 17 00:00:00 2001 +From 089130d865363f60ffce7794d8ba7080e9475a81 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:47:08 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent @@ -52,5 +52,5 @@ index f37491d7..30882559 100644 * Get the amount of experience the player will receive * -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0040-Add-ProjectileCollideEvent.patch b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch similarity index 96% rename from Spigot-API-Patches/0040-Add-ProjectileCollideEvent.patch rename to Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch index e59beae1c8..a7bf6caf4c 100644 --- a/Spigot-API-Patches/0040-Add-ProjectileCollideEvent.patch +++ b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From 4eac0975455ab0ef81f5dac6bf83d475951f9a81 Mon Sep 17 00:00:00 2001 +From 0d310faa3823420b08c8d77d29833c910e196c51 Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent @@ -73,5 +73,5 @@ index 00000000..f42e9851 + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch similarity index 98% rename from Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch rename to Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch index dcb8e03acc..6927d38659 100644 --- a/Spigot-API-Patches/0041-Add-String-based-Action-Bar-API.patch +++ b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch @@ -1,4 +1,4 @@ -From 38f50835d8432bd0552c5fbeb5d53b3aa9aa42f6 Mon Sep 17 00:00:00 2001 +From 64e90092e25dfcb2093727229eabe28f667ee6aa 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 diff --git a/Spigot-API-Patches/0042-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 93% rename from Spigot-API-Patches/0042-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch index e2a1751e9c..52fb0a9567 100644 --- a/Spigot-API-Patches/0042-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,4 +1,4 @@ -From 718a96c9c13faf9b22291e81c70b0170fd4a0501 Mon Sep 17 00:00:00 2001 +From c8592d0fed70ee265eb9bc9c2aa45cf3efacf890 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 @@ -32,5 +32,5 @@ index b4f04517..099da6ce 100644 + // Paper end } -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0043-IllegalPacketEvent.patch b/Spigot-API-Patches/0044-IllegalPacketEvent.patch similarity index 97% rename from Spigot-API-Patches/0043-IllegalPacketEvent.patch rename to Spigot-API-Patches/0044-IllegalPacketEvent.patch index 6d4e261d55..180eb29106 100644 --- a/Spigot-API-Patches/0043-IllegalPacketEvent.patch +++ b/Spigot-API-Patches/0044-IllegalPacketEvent.patch @@ -1,4 +1,4 @@ -From 0f595a2260083d3940ed487003e0351bb75aa1a5 Mon Sep 17 00:00:00 2001 +From df9951c426373976f105802670f755706705761d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 4 Dec 2016 01:19:14 -0500 Subject: [PATCH] IllegalPacketEvent @@ -77,5 +77,5 @@ index 00000000..e11f74fc + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0044-Fireworks-API-s.patch b/Spigot-API-Patches/0045-Fireworks-API-s.patch similarity index 93% rename from Spigot-API-Patches/0044-Fireworks-API-s.patch rename to Spigot-API-Patches/0045-Fireworks-API-s.patch index fc4c068cbc..e31130b524 100644 --- a/Spigot-API-Patches/0044-Fireworks-API-s.patch +++ b/Spigot-API-Patches/0045-Fireworks-API-s.patch @@ -1,4 +1,4 @@ -From e1ee48a404bc7e7c82193a91cc6fa36b1b46c364 Mon Sep 17 00:00:00 2001 +From 03c53cfd5436f75a613567236c4c97f9a0859497 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 28 Dec 2016 01:18:55 -0500 Subject: [PATCH] Fireworks API's diff --git a/Spigot-API-Patches/0045-PlayerTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch similarity index 94% rename from Spigot-API-Patches/0045-PlayerTeleportEndGatewayEvent.patch rename to Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch index cec5a5f63e..34a9c06805 100644 --- a/Spigot-API-Patches/0045-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 718717b647158518a34c36bb8e5623d838e88e29 Mon Sep 17 00:00:00 2001 +From b1cdd9cf910f3b9b6c0adb16d110a9f32b5fa87d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 31 Dec 2016 20:29:33 -0500 Subject: [PATCH] PlayerTeleportEndGatewayEvent @@ -39,5 +39,5 @@ index 00000000..bdefbc9f + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 92% rename from Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch rename to Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch index ebf38b49a3..93d4dcbb3c 100644 --- a/Spigot-API-Patches/0046-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From 5a4ad7c25a554997a5d590629a529cd35f099366 Mon Sep 17 00:00:00 2001 +From fe9d5c94dc4df94951b626e28eeb13a0a4fbbeaa Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:23:03 -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/World.java b/src/main/java/org/bukkit/World.java -index 94647047..06bcee03 100644 +index d62277de..8a0f992f 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -28,6 +28,33 @@ import org.bukkit.util.Vector; @@ -45,5 +45,5 @@ index 94647047..06bcee03 100644 * Gets the {@link Block} at the given coordinates * -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0047-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 98% rename from Spigot-API-Patches/0047-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 105a7b0b99..8b92f53cfb 100644 --- a/Spigot-API-Patches/0047-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From a5987f0c76258d3d57fe1611b8355438ebbcc058 Mon Sep 17 00:00:00 2001 +From 0115c934227d7ae971e287367407bd7a72a186ba Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:28:32 -0500 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player @@ -115,5 +115,5 @@ index c286edfd..f847543b 100644 + // Paper end } -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0048-Expose-WorldBorder-isInBounds-Location-check.patch b/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch similarity index 93% rename from Spigot-API-Patches/0048-Expose-WorldBorder-isInBounds-Location-check.patch rename to Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch index 4ff719941c..7e6a9296c4 100644 --- a/Spigot-API-Patches/0048-Expose-WorldBorder-isInBounds-Location-check.patch +++ b/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch @@ -1,4 +1,4 @@ -From 2938561e612928e665b3e9db9f50e44d5284970e Mon Sep 17 00:00:00 2001 +From bd7776459d0b309752fcdc6b0169ac8508a34989 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 21 Jan 2017 17:03:10 -0600 Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check @@ -28,5 +28,5 @@ index 4dc18edc..41b7fae6 100644 + // Paper end } -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 97% rename from Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch rename to Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch index e4d0225988..6fe896eb29 100644 --- a/Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch @@ -1,4 +1,4 @@ -From d34bbb981986fda1507431108f1c315cdfd1c91d Mon Sep 17 00:00:00 2001 +From e8a0fcc32795014e18a8be640522fecddc8f4541 Mon Sep 17 00:00:00 2001 From: kashike Date: Fri, 9 Jun 2017 07:24:24 -0700 Subject: [PATCH] Add configuration option to prevent player names from being diff --git a/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch similarity index 99% rename from Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch rename to Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch index 9ee5ac26eb..8535795b82 100644 --- a/Spigot-API-Patches/0050-Fix-upstream-javadoc-warnings-and-errors.patch +++ b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch @@ -1,4 +1,4 @@ -From fd193171492260fcd83f90775fd3e47f68d01f5a Mon Sep 17 00:00:00 2001 +From 7c8eed2edc8e4783ed66f36cb206b95a1f3039de Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 10 Jun 2017 16:59:40 -0500 Subject: [PATCH] Fix upstream javadoc warnings and errors diff --git a/Spigot-API-Patches/0051-Item-canEntityPickup.patch b/Spigot-API-Patches/0052-Item-canEntityPickup.patch similarity index 92% rename from Spigot-API-Patches/0051-Item-canEntityPickup.patch rename to Spigot-API-Patches/0052-Item-canEntityPickup.patch index e6f929fdd1..0f4576f0f6 100644 --- a/Spigot-API-Patches/0051-Item-canEntityPickup.patch +++ b/Spigot-API-Patches/0052-Item-canEntityPickup.patch @@ -1,4 +1,4 @@ -From 360118be75c9c955ddc56da1a41976f2238136af Mon Sep 17 00:00:00 2001 +From 717972d0fe8f0692924a0818c12d44f078ef63fc Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 5 May 2017 03:57:08 -0500 Subject: [PATCH] Item#canEntityPickup @@ -30,5 +30,5 @@ index 90260b7e..2e98e4f9 100644 + // Paper end } -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0052-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 96% rename from Spigot-API-Patches/0052-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch index e9ae025b3f..dffce0a515 100644 --- a/Spigot-API-Patches/0052-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -1,4 +1,4 @@ -From 158701799346c25d8daf92beb3fb9c59922c3aec Mon Sep 17 00:00:00 2001 +From 7e146962920f6d97ea5d9505e4351731dda96483 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 May 2017 06:26:01 -0500 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer @@ -52,5 +52,5 @@ index c76f423e..46c6d519 100644 @Override -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0053-PlayerAttemptPickupItemEvent.patch b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch similarity index 97% rename from Spigot-API-Patches/0053-PlayerAttemptPickupItemEvent.patch rename to Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch index 0e7d9f3740..f500c90a49 100644 --- a/Spigot-API-Patches/0053-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch @@ -1,4 +1,4 @@ -From b989dc1168c035e24f94e0ff25514d579e52f6f7 Mon Sep 17 00:00:00 2001 +From feb2578249055b5ea84eefea5352074314225f0d Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 11 Jun 2017 16:30:37 -0500 Subject: [PATCH] PlayerAttemptPickupItemEvent @@ -96,5 +96,5 @@ index 00000000..480293e9 + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0054-Add-UnknownCommandEvent.patch b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch similarity index 96% rename from Spigot-API-Patches/0054-Add-UnknownCommandEvent.patch rename to Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch index 358ff4d94b..8168c0fe55 100644 --- a/Spigot-API-Patches/0054-Add-UnknownCommandEvent.patch +++ b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch @@ -1,4 +1,4 @@ -From 170f61cabc9f329e6a4159b4a9dc9db4a5d76836 Mon Sep 17 00:00:00 2001 +From 4c16ebe8f181e90a58c0d8546eec8bed09fbb5f7 Mon Sep 17 00:00:00 2001 From: Sweepyoface Date: Sat, 17 Jun 2017 18:48:06 -0400 Subject: [PATCH] Add UnknownCommandEvent @@ -88,5 +88,5 @@ index 00000000..19d634c3 +} + -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch similarity index 99% rename from Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch rename to Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch index 9dffdce2bd..82a033ea55 100644 --- a/Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch +++ b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From ba7ca826a69db5f365c35ebf7ea2f7834f8aaa7e Mon Sep 17 00:00:00 2001 +From 61c8f560cab2b9ca2664390d3284a22a9578d775 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 21:46:46 -0500 Subject: [PATCH] Basic PlayerProfile API diff --git a/Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch similarity index 95% rename from Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch rename to Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch index 58eab74a69..bbff278c64 100644 --- a/Spigot-API-Patches/0056-Shoulder-Entities-Release-API.patch +++ b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch @@ -1,4 +1,4 @@ -From 7ef5a54b38b32977873fa0b50998a9425549967d Mon Sep 17 00:00:00 2001 +From 20ce1d6f58eaa8aa7b041d8f0588ab9505d035ae Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 15:04:51 -0400 Subject: [PATCH] Shoulder Entities Release API diff --git a/Spigot-API-Patches/0057-Profile-Lookup-Events.patch b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch similarity index 98% rename from Spigot-API-Patches/0057-Profile-Lookup-Events.patch rename to Spigot-API-Patches/0058-Profile-Lookup-Events.patch index 84ba731ff6..582fe8a24a 100644 --- a/Spigot-API-Patches/0057-Profile-Lookup-Events.patch +++ b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch @@ -1,4 +1,4 @@ -From 97ffcb9256d9f121a14c42cfc8142f250bafac71 Mon Sep 17 00:00:00 2001 +From cbcd37fcba051f9148b24a33e042f21093ed9f2e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 16:30:44 -0400 Subject: [PATCH] Profile Lookup Events @@ -168,5 +168,5 @@ index 00000000..e5a5986a + +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch similarity index 92% rename from Spigot-API-Patches/0058-Entity-fromMobSpawner.patch rename to Spigot-API-Patches/0059-Entity-fromMobSpawner.patch index 536105ec3d..44d0d5d8f8 100644 --- a/Spigot-API-Patches/0058-Entity-fromMobSpawner.patch +++ b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch @@ -1,4 +1,4 @@ -From 8853a70eb883c407c751dfe4e32e24c70e278c17 Mon Sep 17 00:00:00 2001 +From e5a62fbf4f51754de1e49ce6046eefc76c317a73 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 18 Jun 2017 18:17:05 -0500 Subject: [PATCH] Entity#fromMobSpawner() diff --git a/Spigot-API-Patches/0059-Improve-the-Saddle-API-for-Horses.patch b/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch similarity index 97% rename from Spigot-API-Patches/0059-Improve-the-Saddle-API-for-Horses.patch rename to Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch index e6b76fee94..2c0856bc58 100644 --- a/Spigot-API-Patches/0059-Improve-the-Saddle-API-for-Horses.patch +++ b/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch @@ -1,4 +1,4 @@ -From 93347de85dca36fb232ea77c2c767563e1e40ada Mon Sep 17 00:00:00 2001 +From 9185b0d77ba37d0e88629037967032c2b4ba3761 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Dec 2016 16:12:48 -0500 Subject: [PATCH] Improve the Saddle API for Horses @@ -78,5 +78,5 @@ index 00000000..7944f26a + +public interface SaddledHorseInventory extends AbstractHorseInventory {} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0060-ensureServerConversions-API.patch b/Spigot-API-Patches/0061-ensureServerConversions-API.patch similarity index 94% rename from Spigot-API-Patches/0060-ensureServerConversions-API.patch rename to Spigot-API-Patches/0061-ensureServerConversions-API.patch index a64cdbfdde..88ff60f508 100644 --- a/Spigot-API-Patches/0060-ensureServerConversions-API.patch +++ b/Spigot-API-Patches/0061-ensureServerConversions-API.patch @@ -1,4 +1,4 @@ -From 2d6c06d66fa0bb54e1e769dc71adbb750c64225d Mon Sep 17 00:00:00 2001 +From c6f53269f00ebf72dfb63f9e60fe9d96762faf50 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:55:48 -0400 Subject: [PATCH] ensureServerConversions API @@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr to ensure it meets latest minecraft expectations. diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index ec2b8b8ed..3012aec22 100644 +index ec2b8b8e..3012aec2 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -134,4 +134,16 @@ public interface ItemFactory { @@ -28,7 +28,7 @@ index ec2b8b8ed..3012aec22 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index c744799f6..5e8de1152 100644 +index c744799f..5e8de115 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -506,7 +506,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -65,5 +65,5 @@ index c744799f6..5e8de1152 100644 + // Paper end } -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0061-Add-getI18NDisplayName-API.patch b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch similarity index 93% rename from Spigot-API-Patches/0061-Add-getI18NDisplayName-API.patch rename to Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch index 706d52563d..8700439dfe 100644 --- a/Spigot-API-Patches/0061-Add-getI18NDisplayName-API.patch +++ b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch @@ -1,4 +1,4 @@ -From 51c81236c3fdc09dcf56197c10e8b63ec2f3dd2f Mon Sep 17 00:00:00 2001 +From f31c0b3a4d3fe17a7fd04057156089d7db81dc3a Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:55:48 -0400 Subject: [PATCH] Add getI18NDisplayName API @@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this, You must replace the language file embedded in the server jar. diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index 3012aec22..63dd1b32d 100644 +index 3012aec2..63dd1b32 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -145,5 +145,15 @@ public interface ItemFactory { @@ -28,7 +28,7 @@ index 3012aec22..63dd1b32d 100644 // Paper end } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 5e8de1152..c3cb1247f 100644 +index 5e8de115..c3cb1247 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -582,5 +582,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -49,5 +49,5 @@ index 5e8de1152..c3cb1247f 100644 // Paper end } -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0062-ProfileWhitelistVerifyEvent.patch b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch similarity index 97% rename from Spigot-API-Patches/0062-ProfileWhitelistVerifyEvent.patch rename to Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch index 05f4f5f962..56a4ba613a 100644 --- a/Spigot-API-Patches/0062-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch @@ -1,4 +1,4 @@ -From 0cd8ed512dd2fde1f4d765f39a8cf35c8f91184c Mon Sep 17 00:00:00 2001 +From ad76debcffa4a9ef371ba7f2d8b9c1034f16fba4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Jul 2017 18:11:34 -0500 Subject: [PATCH] ProfileWhitelistVerifyEvent @@ -9,7 +9,7 @@ Allows you to do dynamic whitelisting and change of kick message diff --git a/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java new file mode 100644 -index 000000000..b57fff9fb +index 00000000..b57fff9f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java @@ -0,0 +1,111 @@ @@ -125,5 +125,5 @@ index 000000000..b57fff9fb + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0063-Make-plugins-list-alphabetical.patch b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch similarity index 96% rename from Spigot-API-Patches/0063-Make-plugins-list-alphabetical.patch rename to Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch index e2f99c63fa..30c3586989 100644 --- a/Spigot-API-Patches/0063-Make-plugins-list-alphabetical.patch +++ b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch @@ -1,4 +1,4 @@ -From 37638b5c57bc22517f707779b8c216d3cd24c131 Mon Sep 17 00:00:00 2001 +From 37c5379af867301839590856be1d68cdf1a0b4de Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 02:08:55 -0500 Subject: [PATCH] Make /plugins list alphabetical @@ -50,5 +50,5 @@ index e40b03a7..b1d384e8 100644 } } -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0064-LivingEntity-setKiller.patch b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch similarity index 91% rename from Spigot-API-Patches/0064-LivingEntity-setKiller.patch rename to Spigot-API-Patches/0065-LivingEntity-setKiller.patch index 17ac520970..02fba3485b 100644 --- a/Spigot-API-Patches/0064-LivingEntity-setKiller.patch +++ b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch @@ -1,11 +1,11 @@ -From b267465c0b09938121dd4582c5a62ae80d90da48 Mon Sep 17 00:00:00 2001 +From 66621223158643139e2189afc257009daf70f05e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:49:43 -0500 Subject: [PATCH] LivingEntity#setKiller diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index f67711fd7..3f93b70c1 100644 +index f67711fd..3f93b70c 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -17,6 +17,8 @@ import org.bukkit.projectiles.ProjectileSource; @@ -34,5 +34,5 @@ index f67711fd7..3f93b70c1 100644 * Adds the given {@link PotionEffect} to the living entity. *

-- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0065-Handle-plugin-prefixes-in-implementation-logging-con.patch b/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch similarity index 94% rename from Spigot-API-Patches/0065-Handle-plugin-prefixes-in-implementation-logging-con.patch rename to Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch index 3f482c9c30..e563d0cd4a 100644 --- a/Spigot-API-Patches/0065-Handle-plugin-prefixes-in-implementation-logging-con.patch +++ b/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch @@ -1,4 +1,4 @@ -From 082f9d34462d71296bfea52d7a17efc3dd2b547b Mon Sep 17 00:00:00 2001 +From 950732e4f72ad1ebd0983638df104c7957ecc3ef Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:14:13 +0200 Subject: [PATCH] Handle plugin prefixes in implementation logging @@ -17,7 +17,7 @@ The implementation should handle plugin prefixes by displaying logger names when appropriate. diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java -index 678878064..a81dae439 100644 +index 67887806..a81dae43 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java @@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase { @@ -40,5 +40,5 @@ index 678878064..a81dae439 100644 /** -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch similarity index 92% rename from Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch rename to Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch index a0e856f7db..b8196a0ba4 100644 --- a/Spigot-API-Patches/0066-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -1,4 +1,4 @@ -From d735b2fd3473458c15a83c4cf0635cd19957b476 Mon Sep 17 00:00:00 2001 +From 83b0d804b7335d31c3ff87a7070c401dc869d824 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:33:12 +0200 Subject: [PATCH] Allow plugins to use SLF4J for logging @@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/pom.xml b/pom.xml -index 84ba2076f..3ebc62871 100644 +index 84ba2076..3ebc6287 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,14 @@ @@ -33,7 +33,7 @@ index 84ba2076f..3ebc62871 100644 junit diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java -index 55debf5d5..8d2999ace 100644 +index 55debf5d..8d2999ac 100644 --- a/src/main/java/org/bukkit/plugin/Plugin.java +++ b/src/main/java/org/bukkit/plugin/Plugin.java @@ -157,6 +157,12 @@ public interface Plugin extends TabExecutor { diff --git a/Spigot-API-Patches/0067-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch similarity index 98% rename from Spigot-API-Patches/0067-Add-workaround-for-plugins-modifying-the-parent-of-t.patch rename to Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch index fc1f313028..df0ee2fa33 100644 --- a/Spigot-API-Patches/0067-Add-workaround-for-plugins-modifying-the-parent-of-t.patch +++ b/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch @@ -1,4 +1,4 @@ -From 5e6d3bf1e2743a13eb1876f0513dc3f92bacdccb Mon Sep 17 00:00:00 2001 +From ab1ab274192f3fbc229d5480bf989597e383f1c2 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 19:41:20 +0200 Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin diff --git a/Spigot-API-Patches/0068-Add-PlayerJumpEvent.patch b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch similarity index 98% rename from Spigot-API-Patches/0068-Add-PlayerJumpEvent.patch rename to Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch index 86bba03d78..2bb328fd7e 100644 --- a/Spigot-API-Patches/0068-Add-PlayerJumpEvent.patch +++ b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch @@ -1,4 +1,4 @@ -From 8e15888fcc667e68e2cb6f6d2b2febe36a7b3acd Mon Sep 17 00:00:00 2001 +From f260a9837d5bc3512ba711e4612fb095e71a0c23 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Sep 2017 17:21:32 -0400 Subject: [PATCH] Add PlayerJumpEvent @@ -112,5 +112,5 @@ index 00000000..dd24f9b0 + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0069-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch similarity index 94% rename from Spigot-API-Patches/0069-Expose-client-protocol-version-and-virtual-host.patch rename to Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch index 4c239c06bd..fc0a8cb7d8 100644 --- a/Spigot-API-Patches/0069-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch @@ -1,4 +1,4 @@ -From 80fa06b6f43663f3373953a11477ae13e07b0d91 Mon Sep 17 00:00:00 2001 +From 16cc6fb4885d1c34e7c05dad55cd53b16931ca41 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 10 Oct 2017 18:44:42 +0200 Subject: [PATCH] Expose client protocol version and virtual host @@ -11,7 +11,7 @@ Add a NetworkClient interface that provides access to: diff --git a/src/main/java/com/destroystokyo/paper/network/NetworkClient.java b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java new file mode 100644 -index 000000000..9072e384d +index 00000000..9072e384 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java @@ -0,0 +1,39 @@ @@ -55,7 +55,7 @@ index 000000000..9072e384d + +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 45690a2fa..7434203a4 100644 +index bf284f2c..5e65657a 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -30,7 +30,7 @@ import org.bukkit.scoreboard.Scoreboard; @@ -68,5 +68,5 @@ index 45690a2fa..7434203a4 100644 /** * Gets the "friendly" name to display of this player. This may include -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0070-Add-PlayerArmorChangeEvent.patch b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch similarity index 98% rename from Spigot-API-Patches/0070-Add-PlayerArmorChangeEvent.patch rename to Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch index a40842efcd..863fdcf422 100644 --- a/Spigot-API-Patches/0070-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch @@ -1,4 +1,4 @@ -From 418c1570fa8d0784cfaadd1a7070143ef2de5241 Mon Sep 17 00:00:00 2001 +From fa9d75620f187b39ddf397a8a37e951768f1a1f5 Mon Sep 17 00:00:00 2001 From: pkt77 Date: Fri, 10 Nov 2017 23:45:59 -0500 Subject: [PATCH] Add PlayerArmorChangeEvent @@ -146,5 +146,5 @@ index 00000000..0783ac82 + } +} -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 91% rename from Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch rename to Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch index 931e5ecb33..91699d6ba6 100644 --- a/Spigot-API-Patches/0071-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch @@ -1,4 +1,4 @@ -From 40e27a88bcb3fc6ab3299097db52b9df18ddab77 Mon Sep 17 00:00:00 2001 +From 4196a2419eb0aef7c2d79bc5373c2fc3bd38c81e Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 6 Nov 2017 21:10:01 -0500 Subject: [PATCH] API to get a BlockState without a snapshot @@ -9,7 +9,7 @@ on the real tile entity. This is useful for where performance is needed diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 7664728a0..064acf321 100644 +index 7664728a..064acf32 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -254,6 +254,15 @@ public interface Block extends Metadatable { diff --git a/Spigot-API-Patches/0072-AsyncTabCompleteEvent.patch b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch similarity index 98% rename from Spigot-API-Patches/0072-AsyncTabCompleteEvent.patch rename to Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch index 0a3dbe32cb..b151a0c972 100644 --- a/Spigot-API-Patches/0072-AsyncTabCompleteEvent.patch +++ b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch @@ -1,4 +1,4 @@ -From 87499be0ee0fda808bf4d85547ccf0ad8f979ba3 Mon Sep 17 00:00:00 2001 +From e45cd02ad7224199d008068ce464d820e036130c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Nov 2017 13:17:09 -0500 Subject: [PATCH] AsyncTabCompleteEvent @@ -13,7 +13,7 @@ completion, such as offline players. diff --git a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java new file mode 100644 -index 000000000..3c51aaf92 +index 00000000..3c51aaf9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java @@ -0,0 +1,168 @@ @@ -186,7 +186,7 @@ index 000000000..3c51aaf92 + } +} diff --git a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java -index a6229839c..f0bc3563f 100644 +index a6229839..f0bc3563 100644 --- a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java +++ b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java @@ -1,5 +1,6 @@ @@ -247,5 +247,5 @@ index a6229839c..f0bc3563f 100644 @Override -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0073-Display-warning-on-deprecated-recipe-API.patch b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch similarity index 93% rename from Spigot-API-Patches/0073-Display-warning-on-deprecated-recipe-API.patch rename to Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch index a77122ecfa..31cbf21bbb 100644 --- a/Spigot-API-Patches/0073-Display-warning-on-deprecated-recipe-API.patch +++ b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch @@ -1,4 +1,4 @@ -From 1d72b4d218c0c70b0a95059d93c1ae6d5de73fb6 Mon Sep 17 00:00:00 2001 +From 906da795cc0a27b10fcb9cea756bbc7b8556d9e4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 9 Dec 2017 12:40:25 -0500 Subject: [PATCH] Display warning on deprecated recipe API @@ -10,7 +10,7 @@ on the players login. Plugin authors need to define a key to keep it consistent between server restarts. diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -index 90d6d50cd..80af6cf52 100644 +index 90d6d50c..80af6cf5 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java @@ -25,6 +25,7 @@ public class ShapedRecipe implements Recipe, Keyed { @@ -22,7 +22,7 @@ index 90d6d50cd..80af6cf52 100644 } diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -index ea359c540..7347e7464 100644 +index ea359c54..7347e746 100644 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java @@ -26,6 +26,7 @@ public class ShapelessRecipe implements Recipe, Keyed { @@ -34,5 +34,5 @@ index ea359c540..7347e7464 100644 } -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0074-PlayerPickupExperienceEvent.patch b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch similarity index 97% rename from Spigot-API-Patches/0074-PlayerPickupExperienceEvent.patch rename to Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch index 580f36fcb6..90a22db14a 100644 --- a/Spigot-API-Patches/0074-PlayerPickupExperienceEvent.patch +++ b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch @@ -1,4 +1,4 @@ -From 82123411c5381dec16732f3e729b996f3bfd6baa Mon Sep 17 00:00:00 2001 +From 0b16ea6c94ad803083f1689c590e516a3d609ef4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:00:41 -0500 Subject: [PATCH] PlayerPickupExperienceEvent @@ -88,5 +88,5 @@ index 00000000..f9ef95cd + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0075-ExperienceOrbMergeEvent.patch b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch similarity index 98% rename from Spigot-API-Patches/0075-ExperienceOrbMergeEvent.patch rename to Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch index 127f53b8d7..c81496c34e 100644 --- a/Spigot-API-Patches/0075-ExperienceOrbMergeEvent.patch +++ b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From 690ed111958090f2e13c9a53e6f3296820662330 Mon Sep 17 00:00:00 2001 +From f25f9e92ad692775de20a8953c170896bfb86cb4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:56:24 -0500 Subject: [PATCH] ExperienceOrbMergeEvent @@ -96,5 +96,5 @@ index 00000000..fb5b4b86 + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch similarity index 94% rename from Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch rename to Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch index dab5f8770c..6625af682c 100644 --- a/Spigot-API-Patches/0076-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch @@ -1,4 +1,4 @@ -From 1537081482d80ea6cf1266b73f1c6c75d7f557a4 Mon Sep 17 00:00:00 2001 +From 7cf615732878ee88a9ae3c84136211222235cd03 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 17:38:07 -0500 Subject: [PATCH] Ability to apply mending to XP API @@ -10,7 +10,7 @@ of giving the player experience points. Both an API To standalone mend, and apply mending logic to .giveExp has been added. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 79c0e598a..5f3e085e3 100644 +index 5e65657a..c273b9dc 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -938,12 +938,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -49,5 +49,5 @@ index 79c0e598a..5f3e085e3 100644 /** * Gives the player the amount of experience levels specified. Levels can -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0077-PreCreatureSpawnEvent.patch b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch similarity index 98% rename from Spigot-API-Patches/0077-PreCreatureSpawnEvent.patch rename to Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch index 591fa11db0..dae83f8ce1 100644 --- a/Spigot-API-Patches/0077-PreCreatureSpawnEvent.patch +++ b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From b6f0cd76a70adc45822cfe0588077b30e999c2d2 Mon Sep 17 00:00:00 2001 +From 000a19b1709aa65092d49ea8a248d252b43f3390 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 16:59:43 -0500 Subject: [PATCH] PreCreatureSpawnEvent @@ -119,5 +119,5 @@ index 00000000..bac1cef3 + } +} -- -2.16.1.windows.4 +2.20.1 diff --git a/Spigot-API-Patches/0078-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch similarity index 97% rename from Spigot-API-Patches/0078-PlayerNaturallySpawnCreaturesEvent.patch rename to Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch index d624f1f0d9..c52e759c05 100644 --- a/Spigot-API-Patches/0078-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From eda3592be1d17598e7261a86c55c4377289c2721 Mon Sep 17 00:00:00 2001 +From 32783783cd18b9019b4bb321c8b41df12e9bfebf Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:31:37 -0500 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent @@ -76,5 +76,5 @@ index 00000000..7c6953a7 + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0079-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch similarity index 97% rename from Spigot-API-Patches/0079-Add-setPlayerProfile-API-for-Skulls.patch rename to Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch index a93b378c9b..1aa20fc329 100644 --- a/Spigot-API-Patches/0079-Add-setPlayerProfile-API-for-Skulls.patch +++ b/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch @@ -1,4 +1,4 @@ -From 5dbcfd053603e67423074aaa91dd327e6dca7a60 Mon Sep 17 00:00:00 2001 +From 6df1eea3118148d343e2ba943ed0e79e3272e981 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 19 Jan 2018 00:29:28 -0500 Subject: [PATCH] Add setPlayerProfile API for Skulls @@ -77,5 +77,5 @@ index 15c1dfd9..a458000f 100644 * Gets the owner of the skull. * -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0080-Fill-Profile-Property-Events.patch b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch similarity index 98% rename from Spigot-API-Patches/0080-Fill-Profile-Property-Events.patch rename to Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch index 559cf7d516..1d5718e520 100644 --- a/Spigot-API-Patches/0080-Fill-Profile-Property-Events.patch +++ b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch @@ -1,4 +1,4 @@ -From d6ace9b5fd0e4dc637739347aefb6bcac808120c Mon Sep 17 00:00:00 2001 +From 18c2f27c07c4ae9d951ecf9a7685a0af1b6433fa Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 2 Jan 2018 00:31:08 -0500 Subject: [PATCH] Fill Profile Property Events @@ -169,5 +169,5 @@ index 00000000..aba0c087 + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0081-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch similarity index 96% rename from Spigot-API-Patches/0081-PlayerAdvancementCriterionGrantEvent.patch rename to Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch index 3fa960b358..e267e4199c 100644 --- a/Spigot-API-Patches/0081-PlayerAdvancementCriterionGrantEvent.patch +++ b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch @@ -1,4 +1,4 @@ -From 37b0fe3449844988fdd20179130e820106c703c7 Mon Sep 17 00:00:00 2001 +From 96c07697f9a38156b9d1cf552b0796f60ff807b4 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Jan 2018 08:15:14 -0600 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent @@ -69,5 +69,5 @@ index 00000000..b65ee9e5 + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0082-Add-ArmorStand-Item-Meta.patch b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch similarity index 97% rename from Spigot-API-Patches/0082-Add-ArmorStand-Item-Meta.patch rename to Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch index 49d6ce7d99..c10f68e87d 100644 --- a/Spigot-API-Patches/0082-Add-ArmorStand-Item-Meta.patch +++ b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch @@ -1,4 +1,4 @@ -From c8dfb1c1ac5047c3989ed89c48a202c8e565f4d3 Mon Sep 17 00:00:00 2001 +From a41ad2b2b17582d7d06e0ff76289ae75ddb9d0aa Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 27 Jan 2018 17:06:24 -0500 Subject: [PATCH] Add ArmorStand Item Meta @@ -95,5 +95,5 @@ index 00000000..7e4acfff + void setMarker(boolean marker); +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0083-Optimize-Hoppers.patch b/Spigot-API-Patches/0084-Optimize-Hoppers.patch similarity index 96% rename from Spigot-API-Patches/0083-Optimize-Hoppers.patch rename to Spigot-API-Patches/0084-Optimize-Hoppers.patch index 5c84eddf95..1b04c5e3a7 100644 --- a/Spigot-API-Patches/0083-Optimize-Hoppers.patch +++ b/Spigot-API-Patches/0084-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From 6c67c5ba8e8ce89bfdd90a1d6264d14ba6a9037b Mon Sep 17 00:00:00 2001 +From 05f491b4b41e5682ea37eec688ab9f37d0a4d4e3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 18 Jan 2018 01:00:27 -0500 Subject: [PATCH] Optimize Hoppers @@ -38,5 +38,5 @@ index 06ec99ae..b44cc45b 100644 } -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0084-Tameable-getOwnerUniqueId-API.patch b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch similarity index 94% rename from Spigot-API-Patches/0084-Tameable-getOwnerUniqueId-API.patch rename to Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch index af75200bbd..40040cde60 100644 --- a/Spigot-API-Patches/0084-Tameable-getOwnerUniqueId-API.patch +++ b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch @@ -1,4 +1,4 @@ -From ba8f331145982701fc0e9dc323c75e54fb5130d2 Mon Sep 17 00:00:00 2001 +From 1cbb7e853c6b79fe56bb48056ef19cbf83e4a85f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 24 Feb 2018 00:55:52 -0500 Subject: [PATCH] Tameable#getOwnerUniqueId API @@ -33,5 +33,5 @@ index 44497aa3..0987c1e8 100644 */ public AnimalTamer getOwner(); -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0085-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 96% rename from Spigot-API-Patches/0085-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index 43c1e2acf8..c03d567f01 100644 --- a/Spigot-API-Patches/0085-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -1,4 +1,4 @@ -From 320c3d77f68b7b02d88d293898e91681cac3c90e Mon Sep 17 00:00:00 2001 +From 596ebbbd59baec68f0614f1e3d91e04dd5125562 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 11:43:30 -0400 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent @@ -51,5 +51,5 @@ index 1d571889..0c16128e 100644 this.message = ""; this.name = name; -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0086-Add-extended-PaperServerListPingEvent.patch b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch similarity index 99% rename from Spigot-API-Patches/0086-Add-extended-PaperServerListPingEvent.patch rename to Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch index fce66dd13b..1c9d5e63a5 100644 --- a/Spigot-API-Patches/0086-Add-extended-PaperServerListPingEvent.patch +++ b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 4987254c0fc69b5f08d88f3dec52e37a6e68140d Mon Sep 17 00:00:00 2001 +From 62f34963ecb11533fab2828dfd058a95235bdb67 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 15:55:38 +0200 Subject: [PATCH] Add extended PaperServerListPingEvent diff --git a/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch similarity index 95% rename from Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch rename to Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch index a95feb484b..15be533663 100644 --- a/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch +++ b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From c06616f07f969d2090db6ea62443e683748d7f73 Mon Sep 17 00:00:00 2001 +From efed9414eb7c7ae2509d89bb10a338a0a49347ce Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 12:28:55 -0400 Subject: [PATCH] Player.setPlayerProfile API diff --git a/Spigot-API-Patches/0088-getPlayerUniqueId-API.patch b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch similarity index 94% rename from Spigot-API-Patches/0088-getPlayerUniqueId-API.patch rename to Spigot-API-Patches/0089-getPlayerUniqueId-API.patch index 94c29a4035..77758f8bf0 100644 --- a/Spigot-API-Patches/0088-getPlayerUniqueId-API.patch +++ b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From a6af67f99eedf4c5f95deb04a8f4bac3be154a7f Mon Sep 17 00:00:00 2001 +From e5672f4f22bb0f9012699159f3ea469d020439be Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:39:28 -0400 Subject: [PATCH] getPlayerUniqueId API @@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index bc04472e..bd246827 100644 +index 75634a8d..cbabd807 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -435,6 +435,20 @@ public final class Bukkit { @@ -34,7 +34,7 @@ index bc04472e..bd246827 100644 * Gets the plugin manager for interfacing with plugins. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 9f3ffb16..5eb1d371 100644 +index 1d1f7784..9c5049cd 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -365,6 +365,18 @@ public interface Server extends PluginMessageRecipient { diff --git a/Spigot-API-Patches/0089-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch similarity index 94% rename from Spigot-API-Patches/0089-Add-legacy-ping-support-to-PaperServerListPingEvent.patch rename to Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch index a648c31fb3..07a8d55fd0 100644 --- a/Spigot-API-Patches/0089-Add-legacy-ping-support-to-PaperServerListPingEvent.patch +++ b/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 3866b0ae220a8374b807898691fa739df7b004f8 Mon Sep 17 00:00:00 2001 +From 2411eb933aeb83a5124757188f75cdc6a14717e3 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 19:30:20 +0200 Subject: [PATCH] Add legacy ping support to PaperServerListPingEvent diff --git a/Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch similarity index 92% rename from Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch rename to Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch index 6786b3185e..bac72ef713 100644 --- a/Spigot-API-Patches/0090-Add-method-to-open-already-placed-sign.patch +++ b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch @@ -1,4 +1,4 @@ -From c00df0fb555cd5271eec8c911fb1899020bc1a2a Mon Sep 17 00:00:00 2001 +From 30c6337b2360b9771076eecc17f04d913e8b9267 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 1 Apr 2018 02:28:43 +0300 Subject: [PATCH] Add method to open already placed sign diff --git a/Spigot-API-Patches/0091-Add-version-history-to-version-command.patch b/Spigot-API-Patches/0092-Add-version-history-to-version-command.patch similarity index 98% rename from Spigot-API-Patches/0091-Add-version-history-to-version-command.patch rename to Spigot-API-Patches/0092-Add-version-history-to-version-command.patch index bfb4c5dd4a..6e44229a9c 100644 --- a/Spigot-API-Patches/0091-Add-version-history-to-version-command.patch +++ b/Spigot-API-Patches/0092-Add-version-history-to-version-command.patch @@ -1,4 +1,4 @@ -From 34043f0447c8342e21d4a3e64a0991a7cb00a46c Mon Sep 17 00:00:00 2001 +From 0a63d922250d7a43024aab5ea89b511396cde43a Mon Sep 17 00:00:00 2001 From: Kyle Wood Date: Thu, 1 Mar 2018 19:37:52 -0600 Subject: [PATCH] Add version history to version command @@ -6,7 +6,7 @@ Subject: [PATCH] Add version history to version command diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java new file mode 100644 -index 000000000..1daaca2fd +index 00000000..1daaca2f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java @@ -0,0 +1,143 @@ @@ -154,7 +154,7 @@ index 000000000..1daaca2fd + } +} diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -index f38f68640..5cebb2454 100644 +index f38f6864..5cebb245 100644 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java @@ -29,6 +29,7 @@ import org.json.simple.parser.ParseException; @@ -197,5 +197,5 @@ index f38f68640..5cebb2454 100644 PluginDescriptionFile desc = plugin.getDescription(); sender.sendMessage(ChatColor.GREEN + desc.getName() + ChatColor.WHITE + " version " + ChatColor.GREEN + desc.getVersion()); -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch similarity index 98% rename from Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch rename to Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch index 67aecba419..c6aa974c60 100644 --- a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch +++ b/Spigot-API-Patches/0093-Add-Ban-Methods-to-Player-Objects.patch @@ -1,4 +1,4 @@ -From 366c846839d73d5acaee73780f2cd046519e6b2d Mon Sep 17 00:00:00 2001 +From b2247dff46727c6576f4943354996ff552e21791 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 28 Apr 2018 10:28:50 -0400 Subject: [PATCH] Add Ban Methods to Player Objects @@ -8,7 +8,7 @@ Allows a more logical API for banning players. player.banPlayer("Breaking the rules"); diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index d82790717..658eac264 100644 +index d8279071..658eac26 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -39,6 +39,56 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio @@ -69,7 +69,7 @@ index d82790717..658eac264 100644 /** * Checks if this player is whitelisted or not diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 1e349066d..c9f027f99 100644 +index 5dc04f47..ddf226a4 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1,10 +1,14 @@ @@ -228,5 +228,5 @@ index 1e349066d..c9f027f99 100644 /** * Sends an Action Bar message to the client. -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch b/Spigot-API-Patches/0094-EndermanEscapeEvent.patch similarity index 97% rename from Spigot-API-Patches/0093-EndermanEscapeEvent.patch rename to Spigot-API-Patches/0094-EndermanEscapeEvent.patch index 9248bc08d0..139393d94f 100644 --- a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch +++ b/Spigot-API-Patches/0094-EndermanEscapeEvent.patch @@ -1,4 +1,4 @@ -From e6e2f854d47264daa82dac76e0e9b50e1d048112 Mon Sep 17 00:00:00 2001 +From 66cc32083b1330586dff52b36c17828d0ed2d6e7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:14:30 -0400 Subject: [PATCH] EndermanEscapeEvent @@ -96,5 +96,5 @@ index 00000000..0d15a8ab + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch b/Spigot-API-Patches/0095-Enderman.teleportRandomly.patch similarity index 89% rename from Spigot-API-Patches/0094-Enderman.teleportRandomly.patch rename to Spigot-API-Patches/0095-Enderman.teleportRandomly.patch index 16e901302f..9e493e3222 100644 --- a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch +++ b/Spigot-API-Patches/0095-Enderman.teleportRandomly.patch @@ -1,4 +1,4 @@ -From d39ff6984ee7da570e62149453cc739c70608e7d Mon Sep 17 00:00:00 2001 +From 1020cf1bb231062418dfebbf41aff92e762a470e Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:29:15 -0400 Subject: [PATCH] Enderman.teleportRandomly() @@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly() Ability to trigger the vanilla "teleport randomly" mechanic of an enderman. diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java -index ab827f83..459ec0c9 100644 +index edb49a20..1ea289b5 100644 --- a/src/main/java/org/bukkit/entity/Enderman.java +++ b/src/main/java/org/bukkit/entity/Enderman.java @@ -8,6 +8,17 @@ import org.bukkit.material.MaterialData; @@ -28,5 +28,5 @@ index ab827f83..459ec0c9 100644 * Gets the id and data of the block that the Enderman is carrying. * -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch b/Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch similarity index 99% rename from Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch rename to Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch index c0b4939df4..21927869a4 100644 --- a/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch +++ b/Spigot-API-Patches/0096-Additional-world.getNearbyEntities-API-s.patch @@ -1,4 +1,4 @@ -From 1d5e8a86bb4cb2d3b56a98d9b8ebb662146398dc Mon Sep 17 00:00:00 2001 +From fd36072a3ce6839ef977bedd24f3b459a0933f3d Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 17:55:28 -0400 Subject: [PATCH] Additional world.getNearbyEntities API's diff --git a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch b/Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch similarity index 90% rename from Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch rename to Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch index 592318344c..ff10370fbd 100644 --- a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch +++ b/Spigot-API-Patches/0097-Location.isChunkLoaded-API.patch @@ -1,4 +1,4 @@ -From d6390344700e8736df3210e7fe2b54d942dd0b3f Mon Sep 17 00:00:00 2001 +From 2b2f63ce1bf3c15f8688b6fb80eed9a83b292114 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 19:27:31 -0400 Subject: [PATCH] Location.isChunkLoaded() API @@ -17,5 +17,5 @@ index 5c3d42cc..1ddebf3c 100644 public boolean equals(Object obj) { if (obj == null) { -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 99% rename from Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch rename to Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch index df93d3c2f6..48ed47766a 100644 --- a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-API-Patches/0098-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From fd0c3591ced0cfa123d9226f18318fb0e0c87536 Mon Sep 17 00:00:00 2001 +From c367daf8d4c29ed21bd88d582dc21bd9abc1c4a7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 29 Aug 2017 23:58:48 -0400 Subject: [PATCH] Expand World.spawnParticle API and add Builder diff --git a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch b/Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch similarity index 97% rename from Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch rename to Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch index 01c6f99826..c1dfd85371 100644 --- a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch +++ b/Spigot-API-Patches/0099-EndermanAttackPlayerEvent.patch @@ -1,4 +1,4 @@ -From 80c1d5d792249102bb1e09659b279183a743c174 Mon Sep 17 00:00:00 2001 +From 75e762447840834a7c3f6e3c48af2136be41b1dc Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 20:17:44 -0400 Subject: [PATCH] EndermanAttackPlayerEvent @@ -9,7 +9,7 @@ This allows you to override/extend the pumpkin/stare logic. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java new file mode 100644 -index 000000000..ab5a7a6b5 +index 00000000..ab5a7a6b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java @@ -0,0 +1,96 @@ @@ -110,5 +110,5 @@ index 000000000..ab5a7a6b5 + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch b/Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch similarity index 99% rename from Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch rename to Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch index 98c06ad681..d45a4b22bb 100644 --- a/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch +++ b/Spigot-API-Patches/0100-Close-Plugin-Class-Loaders-on-Disable.patch @@ -1,4 +1,4 @@ -From 53b080c35566392e83fc231ce763897a0e9420a4 Mon Sep 17 00:00:00 2001 +From e6848b857dc953c4ab20b2d1c9697597488abbf5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 21:33:35 -0400 Subject: [PATCH] Close Plugin Class Loaders on Disable diff --git a/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch b/Spigot-API-Patches/0101-WitchConsumePotionEvent.patch similarity index 96% rename from Spigot-API-Patches/0100-WitchConsumePotionEvent.patch rename to Spigot-API-Patches/0101-WitchConsumePotionEvent.patch index 0d07ec0d84..5d3b52001f 100644 --- a/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch +++ b/Spigot-API-Patches/0101-WitchConsumePotionEvent.patch @@ -1,4 +1,4 @@ -From d902c6cdb1dfed8c8eafff0a513e91a87186c94e Mon Sep 17 00:00:00 2001 +From ba6dedde58f6f28c09dc1d8226c3e8269b956597 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:26:16 -0400 Subject: [PATCH] WitchConsumePotionEvent @@ -7,7 +7,7 @@ Fires when a witch consumes the potion in their hand diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java new file mode 100644 -index 000000000..790218998 +index 00000000..79021899 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java @@ -0,0 +1,64 @@ @@ -77,7 +77,7 @@ index 000000000..790218998 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java new file mode 100644 -index 000000000..6ef6367b6 +index 00000000..6ef6367b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java @@ -0,0 +1,33 @@ @@ -115,5 +115,5 @@ index 000000000..6ef6367b6 + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch b/Spigot-API-Patches/0102-WitchThrowPotionEvent.patch similarity index 97% rename from Spigot-API-Patches/0101-WitchThrowPotionEvent.patch rename to Spigot-API-Patches/0102-WitchThrowPotionEvent.patch index 6c353f8b3a..71e875dc0a 100644 --- a/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch +++ b/Spigot-API-Patches/0102-WitchThrowPotionEvent.patch @@ -1,4 +1,4 @@ -From ec8448715301fcfc22907e25053ce24046112ec7 Mon Sep 17 00:00:00 2001 +From f7201b04e24d4bbf74d326bf78b5edce24be9e0d Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:39:09 -0400 Subject: [PATCH] WitchThrowPotionEvent @@ -79,5 +79,5 @@ index 6ef6367b..77487e28 100644 @Override -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch b/Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch similarity index 95% rename from Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch rename to Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch index 95d0a1f7b7..43d16f0e33 100644 --- a/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch +++ b/Spigot-API-Patches/0103-Location.toBlockLocation-toCenterLocation.patch @@ -1,4 +1,4 @@ -From 6b5682f52304efe35982bf2d15e3d9a25b840b66 Mon Sep 17 00:00:00 2001 +From 316049bab75da64f7cd691eca897200c63ce88b8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 24 May 2018 21:01:13 -0400 Subject: [PATCH] Location.toBlockLocation/toCenterLocation() @@ -40,5 +40,5 @@ index 1ddebf3c..916238c4 100644 public boolean equals(Object obj) { if (obj == null) { -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch b/Spigot-API-Patches/0104-PotionEffect-clone-methods.patch similarity index 94% rename from Spigot-API-Patches/0103-PotionEffect-clone-methods.patch rename to Spigot-API-Patches/0104-PotionEffect-clone-methods.patch index e06249aa3f..56bf276e06 100644 --- a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch +++ b/Spigot-API-Patches/0104-PotionEffect-clone-methods.patch @@ -1,11 +1,11 @@ -From 18997534f496e4e8c96f06b8632f4605bc513711 Mon Sep 17 00:00:00 2001 +From 631b3e9d4a7a908df94994d6d25987747e313a54 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Jun 2018 04:10:13 -0400 Subject: [PATCH] PotionEffect clone methods diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java -index 86616f1b8..efb55d29c 100644 +index 86616f1b..efb55d29 100644 --- a/src/main/java/org/bukkit/potion/PotionEffect.java +++ b/src/main/java/org/bukkit/potion/PotionEffect.java @@ -100,6 +100,27 @@ public class PotionEffect implements ConfigurationSerializable { @@ -37,5 +37,5 @@ index 86616f1b8..efb55d29c 100644 int type = getInt(map, TYPE); PotionEffectType effect = PotionEffectType.getById(type); -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch b/Spigot-API-Patches/0105-WitchReadyPotionEvent.patch similarity index 96% rename from Spigot-API-Patches/0104-WitchReadyPotionEvent.patch rename to Spigot-API-Patches/0105-WitchReadyPotionEvent.patch index 2ccf554f9a..24f62de279 100644 --- a/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch +++ b/Spigot-API-Patches/0105-WitchReadyPotionEvent.patch @@ -1,4 +1,4 @@ -From 21c4e3b980684039972f488f9c55ca46586258c4 Mon Sep 17 00:00:00 2001 +From 9a5e469dbad59679c1d69f3642e2e79fad6ec3bc Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:47:08 -0400 Subject: [PATCH] WitchReadyPotionEvent @@ -7,7 +7,7 @@ Control what potion the witch readies to use diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java new file mode 100644 -index 000000000..0e0c6da71 +index 00000000..0e0c6da7 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java @@ -0,0 +1,74 @@ @@ -86,5 +86,5 @@ index 000000000..0e0c6da71 + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch b/Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch similarity index 89% rename from Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch rename to Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch index a7c9a5238d..7cb661e4e8 100644 --- a/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch +++ b/Spigot-API-Patches/0106-ItemStack-getMaxItemUseDuration.patch @@ -1,4 +1,4 @@ -From e45b4d932c1cf570cf43366467210ead1d75ef6c Mon Sep 17 00:00:00 2001 +From f8b1352c6aaacb5248604cf7e940c98d359f3520 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:59:50 -0400 Subject: [PATCH] ItemStack#getMaxItemUseDuration @@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration Allows you to determine how long it takes to use a usable/consumable item diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index c3cb1247f..26ab1278b 100644 +index c3cb1247..26ab1278 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -593,5 +593,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -24,5 +24,5 @@ index c3cb1247f..26ab1278b 100644 // Paper end } -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0107-Add-EntityTeleportEndGatewayEvent.patch similarity index 94% rename from Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch rename to Spigot-API-Patches/0107-Add-EntityTeleportEndGatewayEvent.patch index f36760f400..6d9e468a3b 100644 --- a/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch +++ b/Spigot-API-Patches/0107-Add-EntityTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From cf716be25a5b5aeea97c416dcc32c03d4572b7d2 Mon Sep 17 00:00:00 2001 +From 7995cd5a3d19ab8fee4f03e45373d17359b61e40 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 9 Jun 2018 13:08:21 +0100 Subject: [PATCH] Add EntityTeleportEndGatewayEvent @@ -40,5 +40,5 @@ index 00000000..80899ecb + +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch similarity index 90% rename from Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch rename to Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch index ea6cf1e188..f3cf108303 100644 --- a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch @@ -1,11 +1,11 @@ -From 3eca0e7cd62c270ed2103ccb6aeaf42b77182278 Mon Sep 17 00:00:00 2001 +From 4dd104bf502818357031380daeb975cfa20b5a8f Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 16 Jun 2018 01:17:39 -0500 Subject: [PATCH] Make shield blocking delay configurable diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 3f93b70c1..99845e67a 100644 +index 3f93b70c..99845e67 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -478,5 +478,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -29,5 +29,5 @@ index 3f93b70c1..99845e67a 100644 // Paper end } -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-API-Patches/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch similarity index 93% rename from Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch rename to Spigot-API-Patches/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch index fbd3e81c17..ca624796f7 100644 --- a/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch +++ b/Spigot-API-Patches/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch @@ -1,4 +1,4 @@ -From 8f0a17d0053904bba6193e2f4d7c46931eb4d966 Mon Sep 17 00:00:00 2001 +From c3d405f0ff5b1c4008276ee3eedc760062e63b2c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 15 Jun 2013 19:52:04 -0400 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API @@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API Adds ability to get what arrow was shot, and control if it should be consumed. diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java -index f8c91a13b..c9eb75aa7 100644 +index f8c91a13..c9eb75aa 100644 --- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java @@ -16,9 +16,28 @@ public class EntityShootBowEvent extends EntityEvent implements Cancellable { @@ -39,5 +39,5 @@ index f8c91a13b..c9eb75aa7 100644 this.projectile = projectile; this.force = force; -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch b/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch similarity index 99% rename from Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch rename to Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch index 03197e4c6f..3e63c2a5a9 100644 --- a/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch +++ b/Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch @@ -1,11 +1,11 @@ -From 0291e3afa5c7bacac717ad667112822f628a515b Mon Sep 17 00:00:00 2001 +From ba6cfb506e1c9225c1945f2235725143c3694279 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 18 Jun 2018 00:41:46 -0500 Subject: [PATCH] Add "getNearbyXXX" methods to Location diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 916238c4d..162a76e8b 100644 +index 916238c4..162a76e8 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -8,6 +8,15 @@ import org.bukkit.configuration.serialization.ConfigurationSerializable; @@ -254,5 +254,5 @@ index 916238c4d..162a76e8b 100644 @Override public boolean equals(Object obj) { -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch b/Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch similarity index 97% rename from Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch rename to Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch index 7133276508..c3e71a4d62 100644 --- a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch +++ b/Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch @@ -1,4 +1,4 @@ -From 0e7cded0791f40a007dcdef8b10c24120e255050 Mon Sep 17 00:00:00 2001 +From ce2602fa36527a7d0883ddbbdded16c95f41b919 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 01:09:27 -0400 Subject: [PATCH] PlayerReadyArrowEvent @@ -8,7 +8,7 @@ Plugins can skip selection of certain arrows and control which is used. diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java new file mode 100644 -index 000000000..6fde1e97f +index 00000000..6fde1e97 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java @@ -0,0 +1,88 @@ @@ -101,5 +101,5 @@ index 000000000..6fde1e97f + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch b/Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch similarity index 96% rename from Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch rename to Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch index 4ff7399394..fe96ba8e09 100644 --- a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch +++ b/Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch @@ -1,4 +1,4 @@ -From 3b6b6156f219653c4c0f1edcb490998333852b72 Mon Sep 17 00:00:00 2001 +From 5694eae25981fb9647ef73f3945e828166bd2ebf Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Mon, 18 Jun 2018 15:40:39 +0200 Subject: [PATCH] Add EntityKnockbackByEntityEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityKnockbackByEntityEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java new file mode 100644 -index 000000000..f6ef11624 +index 00000000..f6ef1162 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java @@ -0,0 +1,76 @@ @@ -87,5 +87,5 @@ index 000000000..f6ef11624 + } +} -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0112-Expand-Explosions-API.patch b/Spigot-API-Patches/0113-Expand-Explosions-API.patch similarity index 99% rename from Spigot-API-Patches/0112-Expand-Explosions-API.patch rename to Spigot-API-Patches/0113-Expand-Explosions-API.patch index a97c3aa186..0f7e576d31 100644 --- a/Spigot-API-Patches/0112-Expand-Explosions-API.patch +++ b/Spigot-API-Patches/0113-Expand-Explosions-API.patch @@ -1,4 +1,4 @@ -From 6553511fc842e8a3ff931f0e1988a86a5366c2f2 Mon Sep 17 00:00:00 2001 +From 91842d1f8cb8b4cb87f7c9c21a1b69445fd4178a Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:24:42 -0500 Subject: [PATCH] Expand Explosions API diff --git a/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch b/Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch similarity index 97% rename from Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch rename to Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch index b7f3f0e0ff..f90ce4c312 100644 --- a/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch +++ b/Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch @@ -1,11 +1,11 @@ -From c8ba7f7135c253c45cff6953dfb2c718a48b3f31 Mon Sep 17 00:00:00 2001 +From 2cfbdc81fc68ad266dd94d3b9a2c1e6bfd0f64ab Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 22 Jun 2018 22:59:18 -0400 Subject: [PATCH] ItemStack API additions for quantity/flags/lore diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 26ab1278b..fb47fc291 100644 +index 26ab1278..fb47fc29 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -2,7 +2,9 @@ package org.bukkit.inventory; @@ -162,5 +162,5 @@ index 26ab1278b..fb47fc291 100644 // Paper end } -- -2.18.0 +2.20.1 diff --git a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 94% rename from Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch rename to Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch index 3669b0665c..3ecfb33a2d 100644 --- a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -1,4 +1,4 @@ -From d398034fd391fa3cd12b5d4427d0d92502b08c79 Mon Sep 17 00:00:00 2001 +From 9f8e94485f7c514cdc6f021b10bc011277a61d8b Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Jun 2018 00:19:19 -0400 Subject: [PATCH] LivingEntity Hand Raised/Item Use API @@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 99845e67a..e3bc04e1c 100644 +index 99845e67..e3bc04e1 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -11,6 +11,7 @@ import org.bukkit.World; @@ -50,5 +50,5 @@ index 99845e67a..e3bc04e1c 100644 // Paper end } -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0115-RangedEntity-API.patch b/Spigot-API-Patches/0116-RangedEntity-API.patch similarity index 98% rename from Spigot-API-Patches/0115-RangedEntity-API.patch rename to Spigot-API-Patches/0116-RangedEntity-API.patch index 551ba9f065..d3ebcab95e 100644 --- a/Spigot-API-Patches/0115-RangedEntity-API.patch +++ b/Spigot-API-Patches/0116-RangedEntity-API.patch @@ -1,4 +1,4 @@ -From 9dabc5dec763aaa3e40a936e56c3f466a83e7ecd Mon Sep 17 00:00:00 2001 +From bb58ce96ecf6200b0b7be48e8bd89eb6371dd297 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 26 Jun 2018 21:34:40 -0400 Subject: [PATCH] RangedEntity API @@ -141,5 +141,5 @@ index 3bc332ee..426d3693 100644 +public interface Wither extends Monster, Boss, RangedEntity { // Paper } -- -2.19.1 +2.20.1 diff --git a/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch b/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch similarity index 93% rename from Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch rename to Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch index a9eb7b06db..ce9c3d9bb2 100644 --- a/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch +++ b/Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch @@ -1,4 +1,4 @@ -From 6b5f92bce47286c4b5f7c42852b75d76386b8ee6 Mon Sep 17 00:00:00 2001 +From 0ca84ee15c94cc1a2849f7c9476c58c127283221 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 3 Jul 2018 16:07:16 +0200 Subject: [PATCH] Add World.getEntity(UUID) API diff --git a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch b/Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch similarity index 96% rename from Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch rename to Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch index 60f307ad4e..31aa47305a 100644 --- a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From 79b0b5b19b53d8ecf4eeeae5adbd66d271ce7fd1 Mon Sep 17 00:00:00 2001 +From a71408a2ea0e5a1f5e3bc4ce3349f498b0aa78d2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:52:52 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index ca789867..d4b3caeb 100644 +index b5ed8447..74f5588e 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -138,6 +138,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder diff --git a/Spigot-API-Patches/0118-Entity-getChunk-API.patch b/Spigot-API-Patches/0119-Entity-getChunk-API.patch similarity index 93% rename from Spigot-API-Patches/0118-Entity-getChunk-API.patch rename to Spigot-API-Patches/0119-Entity-getChunk-API.patch index 04d3f8db31..d28cd1866d 100644 --- a/Spigot-API-Patches/0118-Entity-getChunk-API.patch +++ b/Spigot-API-Patches/0119-Entity-getChunk-API.patch @@ -1,4 +1,4 @@ -From 24a392e31d55b9c82325f678c70eddee787ade76 Mon Sep 17 00:00:00 2001 +From 088a1cede4417ff631ad5eb16be9b5a51b552520 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 02:25:48 -0400 Subject: [PATCH] Entity#getChunk API diff --git a/Spigot-API-Patches/0119-Vex-getSummoner-API.patch b/Spigot-API-Patches/0120-Vex-getSummoner-API.patch similarity index 91% rename from Spigot-API-Patches/0119-Vex-getSummoner-API.patch rename to Spigot-API-Patches/0120-Vex-getSummoner-API.patch index ecfb4ce43b..abcaa567ca 100644 --- a/Spigot-API-Patches/0119-Vex-getSummoner-API.patch +++ b/Spigot-API-Patches/0120-Vex-getSummoner-API.patch @@ -1,4 +1,4 @@ -From b1935b33977f5215db28c156d7f75428b14f6ff3 Mon Sep 17 00:00:00 2001 +From 31def18565e09b797cffabedeff88881b21ba67e Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 15:29:21 -0400 Subject: [PATCH] Vex#getSummoner API diff --git a/Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch b/Spigot-API-Patches/0121-Add-an-asterisk-to-legacy-API-plugins.patch similarity index 97% rename from Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch rename to Spigot-API-Patches/0121-Add-an-asterisk-to-legacy-API-plugins.patch index 9990ac31aa..f35fbeaedd 100644 --- a/Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch +++ b/Spigot-API-Patches/0121-Add-an-asterisk-to-legacy-API-plugins.patch @@ -1,4 +1,4 @@ -From 6a6db0639bc7f151df29e0df293006646abf49b1 Mon Sep 17 00:00:00 2001 +From 6230eaa152107e64e9b93acba461412d68f368a6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 19 Jul 2018 15:07:02 -0500 Subject: [PATCH] Add an asterisk to legacy API plugins diff --git a/Spigot-API-Patches/0121-EnderDragon-Events.patch b/Spigot-API-Patches/0122-EnderDragon-Events.patch similarity index 98% rename from Spigot-API-Patches/0121-EnderDragon-Events.patch rename to Spigot-API-Patches/0122-EnderDragon-Events.patch index f3bdb9d006..7d9283e01d 100644 --- a/Spigot-API-Patches/0121-EnderDragon-Events.patch +++ b/Spigot-API-Patches/0122-EnderDragon-Events.patch @@ -1,4 +1,4 @@ -From 64eef514b6ae25b70d6492dd9d96b6cdcdd3931f Mon Sep 17 00:00:00 2001 +From fb308e1a72dc6e3c0f8c492467f29201a85e0a91 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:51:05 -0500 Subject: [PATCH] EnderDragon Events diff --git a/Spigot-API-Patches/0122-PlayerLaunchProjectileEvent.patch b/Spigot-API-Patches/0123-PlayerLaunchProjectileEvent.patch similarity index 97% rename from Spigot-API-Patches/0122-PlayerLaunchProjectileEvent.patch rename to Spigot-API-Patches/0123-PlayerLaunchProjectileEvent.patch index d39b2e9831..51bd51a191 100644 --- a/Spigot-API-Patches/0122-PlayerLaunchProjectileEvent.patch +++ b/Spigot-API-Patches/0123-PlayerLaunchProjectileEvent.patch @@ -1,4 +1,4 @@ -From b36a6f13151c1fc128d1c0233f1bb4df1a7f6e76 Mon Sep 17 00:00:00 2001 +From bf0b9b976aa75c1a7005cf174094d9ca47bc606e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 03:10:50 -0500 Subject: [PATCH] PlayerLaunchProjectileEvent diff --git a/Spigot-API-Patches/0123-PlayerElytraBoostEvent.patch b/Spigot-API-Patches/0124-PlayerElytraBoostEvent.patch similarity index 97% rename from Spigot-API-Patches/0123-PlayerElytraBoostEvent.patch rename to Spigot-API-Patches/0124-PlayerElytraBoostEvent.patch index 3aad2aec0d..17d389b536 100644 --- a/Spigot-API-Patches/0123-PlayerElytraBoostEvent.patch +++ b/Spigot-API-Patches/0124-PlayerElytraBoostEvent.patch @@ -1,4 +1,4 @@ -From b25f41eb2d736563f05bf96f5fb27fa6eddfecd9 Mon Sep 17 00:00:00 2001 +From 94b04d1ac897e5e4791b99fa90c08df37f9c6750 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:59:53 -0500 Subject: [PATCH] PlayerElytraBoostEvent diff --git a/Spigot-API-Patches/0124-EntityTransformedEvent.patch b/Spigot-API-Patches/0125-EntityTransformedEvent.patch similarity index 97% rename from Spigot-API-Patches/0124-EntityTransformedEvent.patch rename to Spigot-API-Patches/0125-EntityTransformedEvent.patch index dc081a7b5c..3cca58d095 100644 --- a/Spigot-API-Patches/0124-EntityTransformedEvent.patch +++ b/Spigot-API-Patches/0125-EntityTransformedEvent.patch @@ -1,4 +1,4 @@ -From 00607241674731c78d1bcb0da531d41e6cf92255 Mon Sep 17 00:00:00 2001 +From 2d0638abd370a00a03addda58ca3b8a329b4add1 Mon Sep 17 00:00:00 2001 From: Anthony MacAllister Date: Thu, 26 Jul 2018 15:28:53 -0400 Subject: [PATCH] EntityTransformedEvent diff --git a/Spigot-API-Patches/0125-Allow-disabling-armour-stand-ticking.patch b/Spigot-API-Patches/0126-Allow-disabling-armour-stand-ticking.patch similarity index 94% rename from Spigot-API-Patches/0125-Allow-disabling-armour-stand-ticking.patch rename to Spigot-API-Patches/0126-Allow-disabling-armour-stand-ticking.patch index 065888707c..f31a1e925b 100644 --- a/Spigot-API-Patches/0125-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-API-Patches/0126-Allow-disabling-armour-stand-ticking.patch @@ -1,4 +1,4 @@ -From b3cef7931e7f7432927b1fefc8282c4b5e554045 Mon Sep 17 00:00:00 2001 +From 77f6eac530bd01aeff4c2c3c1ed93d5fef29a09d 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/Spigot-API-Patches/0126-SkeletonHorse-Additions.patch b/Spigot-API-Patches/0127-SkeletonHorse-Additions.patch similarity index 97% rename from Spigot-API-Patches/0126-SkeletonHorse-Additions.patch rename to Spigot-API-Patches/0127-SkeletonHorse-Additions.patch index 695571ad6e..15c31093f3 100644 --- a/Spigot-API-Patches/0126-SkeletonHorse-Additions.patch +++ b/Spigot-API-Patches/0127-SkeletonHorse-Additions.patch @@ -1,4 +1,4 @@ -From 691303b8d4cabb5dd2a8b0a2b4d1562a613934f1 Mon Sep 17 00:00:00 2001 +From f1362aab9af2f1592ae39f6fefc5805426c13468 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 27 Jul 2018 22:36:17 -0500 Subject: [PATCH] SkeletonHorse Additions diff --git a/Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch b/Spigot-API-Patches/0128-Expand-Location-Manipulation-API.patch similarity index 97% rename from Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch rename to Spigot-API-Patches/0128-Expand-Location-Manipulation-API.patch index 84fc01b683..7f2ca8767e 100644 --- a/Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch +++ b/Spigot-API-Patches/0128-Expand-Location-Manipulation-API.patch @@ -1,4 +1,4 @@ -From df879ce4d5f270cd7b52d86948b8a4401a9d543d Mon Sep 17 00:00:00 2001 +From c2f3378222678178ed336881bfe3efb4cb3c96f5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 25 Jul 2018 01:36:07 -0400 Subject: [PATCH] Expand Location Manipulation API diff --git a/Spigot-API-Patches/0128-Expand-ArmorStand-API.patch b/Spigot-API-Patches/0129-Expand-ArmorStand-API.patch similarity index 98% rename from Spigot-API-Patches/0128-Expand-ArmorStand-API.patch rename to Spigot-API-Patches/0129-Expand-ArmorStand-API.patch index 2712acfc3c..8d4b85b774 100644 --- a/Spigot-API-Patches/0128-Expand-ArmorStand-API.patch +++ b/Spigot-API-Patches/0129-Expand-ArmorStand-API.patch @@ -1,4 +1,4 @@ -From ee715356b1b15cf9d00a6761b77d10dbbc08b2e5 Mon Sep 17 00:00:00 2001 +From acbc0064ddd9eda092bc7a8685c70f8dce6d7060 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Thu, 26 Jul 2018 02:22:44 -0400 Subject: [PATCH] Expand ArmorStand API diff --git a/Spigot-API-Patches/0129-AnvilDamageEvent.patch b/Spigot-API-Patches/0130-AnvilDamageEvent.patch similarity index 98% rename from Spigot-API-Patches/0129-AnvilDamageEvent.patch rename to Spigot-API-Patches/0130-AnvilDamageEvent.patch index 329b2c0049..9036fdc061 100644 --- a/Spigot-API-Patches/0129-AnvilDamageEvent.patch +++ b/Spigot-API-Patches/0130-AnvilDamageEvent.patch @@ -1,4 +1,4 @@ -From 0f9d603a9e7c9ab64802df817318b11c73fc40e3 Mon Sep 17 00:00:00 2001 +From 564a139305b90aeb9052d70be7b8fc49e36408d7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 20 Jul 2018 23:36:55 -0500 Subject: [PATCH] AnvilDamageEvent diff --git a/Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch b/Spigot-API-Patches/0131-Remove-deadlock-risk-in-firing-async-events.patch similarity index 98% rename from Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch rename to Spigot-API-Patches/0131-Remove-deadlock-risk-in-firing-async-events.patch index 1907af4446..55c3d71a24 100644 --- a/Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch +++ b/Spigot-API-Patches/0131-Remove-deadlock-risk-in-firing-async-events.patch @@ -1,4 +1,4 @@ -From 0c1023b2f663801604199610c741023df370b001 Mon Sep 17 00:00:00 2001 +From 562bc11c9c2f58733eaad70a3428fcf14e0c8cc5 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 diff --git a/Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch b/Spigot-API-Patches/0132-Add-hand-to-bucket-events.patch similarity index 98% rename from Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch rename to Spigot-API-Patches/0132-Add-hand-to-bucket-events.patch index 22044c3940..bd3af99eb2 100644 --- a/Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch +++ b/Spigot-API-Patches/0132-Add-hand-to-bucket-events.patch @@ -1,4 +1,4 @@ -From 76661328370d7b5f0401ca7b82a4044da8b58398 Mon Sep 17 00:00:00 2001 +From c26a68ca5346089491588eba1c535b4994b93b0c 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/Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch b/Spigot-API-Patches/0133-Add-TNTPrimeEvent.patch similarity index 98% rename from Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch rename to Spigot-API-Patches/0133-Add-TNTPrimeEvent.patch index d8920d9edb..346ceabdda 100644 --- a/Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch +++ b/Spigot-API-Patches/0133-Add-TNTPrimeEvent.patch @@ -1,4 +1,4 @@ -From 158e880fb788c001e8f0488860132577c9b0bdc9 Mon Sep 17 00:00:00 2001 +From d7f11e824bfc6d99d652b20a136ebbb080604d09 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 15 Jul 2018 22:17:55 +0300 Subject: [PATCH] Add TNTPrimeEvent diff --git a/Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch b/Spigot-API-Patches/0134-Provide-Chunk-Coordinates-as-a-Long-API.patch similarity index 96% rename from Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch rename to Spigot-API-Patches/0134-Provide-Chunk-Coordinates-as-a-Long-API.patch index 464b94f373..74663490fc 100644 --- a/Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch +++ b/Spigot-API-Patches/0134-Provide-Chunk-Coordinates-as-a-Long-API.patch @@ -1,4 +1,4 @@ -From 29b931883c7086125b1f923b07f1282da12564f0 Mon Sep 17 00:00:00 2001 +From d79f06b36da5d3fc3aed359bdafd8c15d445488c 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 @@ -44,7 +44,7 @@ index 441ed7ad..33cd0ea0 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 301d9418..deabd400 100644 +index e424ed4e..807bd7fc 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -139,6 +139,21 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-API-Patches/0134-Async-Chunks-API.patch b/Spigot-API-Patches/0135-Async-Chunks-API.patch similarity index 99% rename from Spigot-API-Patches/0134-Async-Chunks-API.patch rename to Spigot-API-Patches/0135-Async-Chunks-API.patch index e7b9555620..361634ac32 100644 --- a/Spigot-API-Patches/0134-Async-Chunks-API.patch +++ b/Spigot-API-Patches/0135-Async-Chunks-API.patch @@ -1,4 +1,4 @@ -From 950ee556b124e63be9df736c7a6297cdfa3030d7 Mon Sep 17 00:00:00 2001 +From 6dc478f219217b81d31c62ff433aaac40052ed7b Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 17:43:33 -0600 Subject: [PATCH] Async Chunks API @@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously. Also adds utility methods to Entity to teleport asynchronously. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index deabd400..92688252 100644 +index 807bd7fc..61f2cd9a 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -152,6 +152,352 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-API-Patches/0135-Make-EnderDragon-extend-Mob.patch b/Spigot-API-Patches/0136-Make-EnderDragon-extend-Mob.patch similarity index 91% rename from Spigot-API-Patches/0135-Make-EnderDragon-extend-Mob.patch rename to Spigot-API-Patches/0136-Make-EnderDragon-extend-Mob.patch index f8089d415a..f74a3387b2 100644 --- a/Spigot-API-Patches/0135-Make-EnderDragon-extend-Mob.patch +++ b/Spigot-API-Patches/0136-Make-EnderDragon-extend-Mob.patch @@ -1,4 +1,4 @@ -From 6361a0fad5e6fda97790f4f72d39cdda3b766fcb Mon Sep 17 00:00:00 2001 +From 6c2530d6ef60109990d1926cf94687fb965322f4 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/Spigot-API-Patches/0136-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 94% rename from Spigot-API-Patches/0136-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 87e3b6ef1a..3b4fd35d3e 100644 --- a/Spigot-API-Patches/0136-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,4 +1,4 @@ -From c70c957d8f12e7449791fc452632a12e3b316800 Mon Sep 17 00:00:00 2001 +From 5d64bc594253075e2db995ffae4049d83a0ce47b 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/Spigot-API-Patches/0137-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 93% rename from Spigot-API-Patches/0137-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 b9c90578e5..0c3bd26ac3 100644 --- a/Spigot-API-Patches/0137-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,4 +1,4 @@ -From 437e17e4c522a9e7f87441f3b44efc36166f8b53 Mon Sep 17 00:00:00 2001 +From a77d163e8cf3a60d91946ea48bc4a3939fb865b2 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/Spigot-API-Patches/0138-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/0138-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 f609e8c5b6..3810a2e8f3 100644 --- a/Spigot-API-Patches/0138-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 39f3eeefa7b52425c8f1dd8fea1c0388ead63454 Mon Sep 17 00:00:00 2001 +From 52bcd82fc9c739a5d191a3facdefc09304f1c527 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 61f2cd9a7..30204b987 100644 +index 61f2cd9a..30204b98 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -75,6 +75,37 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -91,7 +91,7 @@ index 61f2cd9a7..30204b987 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 064acf321..d1a9512aa 100644 +index 064acf32..d1a9512a 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -144,6 +144,33 @@ public interface Block extends Metadatable { diff --git a/Spigot-API-Patches/0139-Slime-Pathfinder-Events.patch b/Spigot-API-Patches/0140-Slime-Pathfinder-Events.patch similarity index 99% rename from Spigot-API-Patches/0139-Slime-Pathfinder-Events.patch rename to Spigot-API-Patches/0140-Slime-Pathfinder-Events.patch index 06a0592c01..58f7e1c0db 100644 --- a/Spigot-API-Patches/0139-Slime-Pathfinder-Events.patch +++ b/Spigot-API-Patches/0140-Slime-Pathfinder-Events.patch @@ -1,4 +1,4 @@ -From 6c82e7b5c506dfd85e0f5d607c218966c035e06c Mon Sep 17 00:00:00 2001 +From 7384fc53c3bf6e6025a819fd016e540863824bd5 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 08:18:27 -0500 Subject: [PATCH] Slime Pathfinder Events diff --git a/Spigot-API-Patches/0140-isChunkGenerated-API.patch b/Spigot-API-Patches/0141-isChunkGenerated-API.patch similarity index 95% rename from Spigot-API-Patches/0140-isChunkGenerated-API.patch rename to Spigot-API-Patches/0141-isChunkGenerated-API.patch index 250d8803fc..7390c9bf66 100644 --- a/Spigot-API-Patches/0140-isChunkGenerated-API.patch +++ b/Spigot-API-Patches/0141-isChunkGenerated-API.patch @@ -1,4 +1,4 @@ -From 5bc40b8e037de01dacf424153054ac40301efefa Mon Sep 17 00:00:00 2001 +From ffe839718dd01ef749ae94c6c14f29d85e2f0a72 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 @@ -33,7 +33,7 @@ index 7e1ee875..9457832b 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 1467debe..668c9b7a 100644 +index 30204b98..60b7f2e3 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -184,6 +184,17 @@ public interface World extends PluginMessageRecipient, Metadatable { diff --git a/Spigot-API-Patches/0141-Add-More-Creeper-API.patch b/Spigot-API-Patches/0142-Add-More-Creeper-API.patch similarity index 97% rename from Spigot-API-Patches/0141-Add-More-Creeper-API.patch rename to Spigot-API-Patches/0142-Add-More-Creeper-API.patch index 4a91a8dcd5..f9565ae622 100644 --- a/Spigot-API-Patches/0141-Add-More-Creeper-API.patch +++ b/Spigot-API-Patches/0142-Add-More-Creeper-API.patch @@ -1,4 +1,4 @@ -From eb0f960daf853e86b7b33d48033746b6fe4a0e4d Mon Sep 17 00:00:00 2001 +From fda59fa4f5a093943b96470845aee44a5ba8387a Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 11:50:16 -0500 Subject: [PATCH] Add More Creeper API diff --git a/Spigot-API-Patches/0142-Add-PhantomPreSpawnEvent.patch b/Spigot-API-Patches/0143-Add-PhantomPreSpawnEvent.patch similarity index 96% rename from Spigot-API-Patches/0142-Add-PhantomPreSpawnEvent.patch rename to Spigot-API-Patches/0143-Add-PhantomPreSpawnEvent.patch index aa23742557..c1954171f7 100644 --- a/Spigot-API-Patches/0142-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-API-Patches/0143-Add-PhantomPreSpawnEvent.patch @@ -1,4 +1,4 @@ -From f5a1ce4f2c76ea0c0e04db4c4f8e292923864147 Mon Sep 17 00:00:00 2001 +From 1e8a2a87d4fed943f6c6010a99b12204c0b9fdf3 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 25 Aug 2018 19:56:42 -0500 Subject: [PATCH] Add PhantomPreSpawnEvent diff --git a/Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-API-Patches/0144-Add-source-block-to-BlockPhysicsEvent.patch similarity index 96% rename from Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch rename to Spigot-API-Patches/0144-Add-source-block-to-BlockPhysicsEvent.patch index 43195c3a8e..95f42b0d76 100644 --- a/Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch +++ b/Spigot-API-Patches/0144-Add-source-block-to-BlockPhysicsEvent.patch @@ -1,4 +1,4 @@ -From f6670ef133f3fce494c9f54045f6267657603349 Mon Sep 17 00:00:00 2001 +From e8b6405b84b65b5726de26bbcff1c2ef0b0519ee 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/Spigot-API-Patches/0144-Inventory-removeItemAnySlot.patch b/Spigot-API-Patches/0145-Inventory-removeItemAnySlot.patch similarity index 96% rename from Spigot-API-Patches/0144-Inventory-removeItemAnySlot.patch rename to Spigot-API-Patches/0145-Inventory-removeItemAnySlot.patch index 301b7f44cc..ce19d47fb1 100644 --- a/Spigot-API-Patches/0144-Inventory-removeItemAnySlot.patch +++ b/Spigot-API-Patches/0145-Inventory-removeItemAnySlot.patch @@ -1,4 +1,4 @@ -From 0d5f37d29aa15797bee4ce70de33397738a66fd7 Mon Sep 17 00:00:00 2001 +From ffab9eae4ca06c397e8b4ac825718180dfd3fa3b 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/Spigot-API-Patches/0145-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-API-Patches/0146-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 98% rename from Spigot-API-Patches/0145-Add-ray-tracing-methods-to-LivingEntity.patch rename to Spigot-API-Patches/0146-Add-ray-tracing-methods-to-LivingEntity.patch index 641feb3a2b..6fdd019039 100644 --- a/Spigot-API-Patches/0145-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-API-Patches/0146-Add-ray-tracing-methods-to-LivingEntity.patch @@ -1,4 +1,4 @@ -From 797ddcb8d1d7aaa58ed9a7c7fb867158e932facc Mon Sep 17 00:00:00 2001 +From 4f708c4bde046ce0d7b1a503cae15ac7455d4a1a 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 diff --git a/Spigot-API-Patches/0146-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch similarity index 95% rename from Spigot-API-Patches/0146-Expose-attack-cooldown-methods-for-Player.patch rename to Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch index 79be6bc9b0..ff3a46ca2f 100644 --- a/Spigot-API-Patches/0146-Expose-attack-cooldown-methods-for-Player.patch +++ b/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch @@ -1,4 +1,4 @@ -From 36702ab9217feee7fb8138631226888469ca70d2 Mon Sep 17 00:00:00 2001 +From a4efb03d3d60ea69b16af96345a61f3530344373 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 4 Sep 2018 15:01:54 -0500 Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/Spigot-API-Patches/0147-Improve-death-events.patch b/Spigot-API-Patches/0148-Improve-death-events.patch similarity index 98% rename from Spigot-API-Patches/0147-Improve-death-events.patch rename to Spigot-API-Patches/0148-Improve-death-events.patch index 6229789f93..8525084947 100644 --- a/Spigot-API-Patches/0147-Improve-death-events.patch +++ b/Spigot-API-Patches/0148-Improve-death-events.patch @@ -1,4 +1,4 @@ -From 693483de100436c064845dd752f5f1ee987450fd Mon Sep 17 00:00:00 2001 +From d41259020da1d0585cab3a286f3828a8be797415 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:32:28 +0100 Subject: [PATCH] Improve death events diff --git a/Spigot-API-Patches/0148-Mob-Pathfinding-API.patch b/Spigot-API-Patches/0149-Mob-Pathfinding-API.patch similarity index 99% rename from Spigot-API-Patches/0148-Mob-Pathfinding-API.patch rename to Spigot-API-Patches/0149-Mob-Pathfinding-API.patch index 6d6e509217..f244a8fbc4 100644 --- a/Spigot-API-Patches/0148-Mob-Pathfinding-API.patch +++ b/Spigot-API-Patches/0149-Mob-Pathfinding-API.patch @@ -1,4 +1,4 @@ -From e56639fa55ad0e1d2a489c71c999dfba9aafda53 Mon Sep 17 00:00:00 2001 +From 67e1e492304b1ca36e9c50796a15c45c19ec0e7c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 12:39:06 -0400 Subject: [PATCH] Mob Pathfinding API diff --git a/Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/Spigot-API-Patches/0150-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch similarity index 99% rename from Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch rename to Spigot-API-Patches/0150-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch index 42d3d22e59..84f854bcb2 100644 --- a/Spigot-API-Patches/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch +++ b/Spigot-API-Patches/0150-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch @@ -1,4 +1,4 @@ -From 830ac878de07dc95bcef19e838d0d5bf78986b47 Mon Sep 17 00:00:00 2001 +From 54280844e72a78402ba7ce5e7ee5f821a3c1a746 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 12 Sep 2018 18:53:35 +0300 Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values diff --git a/Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch b/Spigot-API-Patches/0151-Performance-Concurrency-Improvements-to-Permissions.patch similarity index 98% rename from Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch rename to Spigot-API-Patches/0151-Performance-Concurrency-Improvements-to-Permissions.patch index f92c8ed7c6..2562fa84d9 100644 --- a/Spigot-API-Patches/0150-Performance-Concurrency-Improvements-to-Permissions.patch +++ b/Spigot-API-Patches/0151-Performance-Concurrency-Improvements-to-Permissions.patch @@ -1,4 +1,4 @@ -From 64ae4c1416201184004acc97e8973c304b5382e7 Mon Sep 17 00:00:00 2001 +From f79f2b0711a8c11eec54d8ea9f92cccaa8ec644e Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 13 Sep 2018 20:51:50 -0400 Subject: [PATCH] Performance & Concurrency Improvements to Permissions diff --git a/Spigot-API-Patches/0151-Add-ItemStackRecipeChoice-Draft-API.patch b/Spigot-API-Patches/0152-Add-ItemStackRecipeChoice-Draft-API.patch similarity index 96% rename from Spigot-API-Patches/0151-Add-ItemStackRecipeChoice-Draft-API.patch rename to Spigot-API-Patches/0152-Add-ItemStackRecipeChoice-Draft-API.patch index 13b3969af5..689b2cf944 100644 --- a/Spigot-API-Patches/0151-Add-ItemStackRecipeChoice-Draft-API.patch +++ b/Spigot-API-Patches/0152-Add-ItemStackRecipeChoice-Draft-API.patch @@ -1,4 +1,4 @@ -From b40f077ca0c583d5bd25b14c8ecd7e3eed96b4be Mon Sep 17 00:00:00 2001 +From fbfa236c0d69828e0334e11eba3dcafa725baa09 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 13 Sep 2018 21:39:26 -0400 Subject: [PATCH] Add ItemStackRecipeChoice Draft API diff --git a/Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-API-Patches/0153-Implement-furnace-cook-speed-multiplier-API.patch similarity index 92% rename from Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch rename to Spigot-API-Patches/0153-Implement-furnace-cook-speed-multiplier-API.patch index 248f185073..da9c930897 100644 --- a/Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch +++ b/Spigot-API-Patches/0153-Implement-furnace-cook-speed-multiplier-API.patch @@ -1,4 +1,4 @@ -From 58185cff7179e9c740a3ec88aa09462e91eeb72b Mon Sep 17 00:00:00 2001 +From 6b713fe8147f53ef6b2e75dec0abff2f8f7a0b0a Mon Sep 17 00:00:00 2001 From: Tassu Date: Thu, 13 Sep 2018 08:45:01 +0300 Subject: [PATCH] Implement furnace cook speed multiplier API @@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API Signed-off-by: Tassu diff --git a/src/main/java/org/bukkit/block/Furnace.java b/src/main/java/org/bukkit/block/Furnace.java -index fb82104ba..3df8dc6d4 100644 +index fb82104b..3df8dc6d 100644 --- a/src/main/java/org/bukkit/block/Furnace.java +++ b/src/main/java/org/bukkit/block/Furnace.java @@ -61,6 +61,26 @@ public interface Furnace extends Container, Nameable { diff --git a/Spigot-API-Patches/0153-PreSpawnerSpawnEvent.patch b/Spigot-API-Patches/0154-PreSpawnerSpawnEvent.patch similarity index 96% rename from Spigot-API-Patches/0153-PreSpawnerSpawnEvent.patch rename to Spigot-API-Patches/0154-PreSpawnerSpawnEvent.patch index b6f76b601e..e6acd0dd64 100644 --- a/Spigot-API-Patches/0153-PreSpawnerSpawnEvent.patch +++ b/Spigot-API-Patches/0154-PreSpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 03de4ff3ffc69cd1597f223ab8154466131f3283 Mon Sep 17 00:00:00 2001 +From ee6aedc0ee7297256b3da0dcb2d1b3237617a0a1 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 18 Sep 2018 23:50:10 +0100 Subject: [PATCH] PreSpawnerSpawnEvent diff --git a/Spigot-API-Patches/0154-Remove-Precondition-on-name-for-AttributeModifier.patch b/Spigot-API-Patches/0155-Remove-Precondition-on-name-for-AttributeModifier.patch similarity index 94% rename from Spigot-API-Patches/0154-Remove-Precondition-on-name-for-AttributeModifier.patch rename to Spigot-API-Patches/0155-Remove-Precondition-on-name-for-AttributeModifier.patch index fdd5069201..10b8146cd0 100644 --- a/Spigot-API-Patches/0154-Remove-Precondition-on-name-for-AttributeModifier.patch +++ b/Spigot-API-Patches/0155-Remove-Precondition-on-name-for-AttributeModifier.patch @@ -1,4 +1,4 @@ -From beb196480c0a50f244dfbc99d7d8f8f8f9123e03 Mon Sep 17 00:00:00 2001 +From bb7da65c28eea714e3653bc1d9620e474fd92a9c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 22 Sep 2018 18:41:01 -0400 Subject: [PATCH] Remove Precondition on name for AttributeModifier diff --git a/Spigot-API-Patches/0155-Material-API-additions.patch b/Spigot-API-Patches/0156-Material-API-additions.patch similarity index 92% rename from Spigot-API-Patches/0155-Material-API-additions.patch rename to Spigot-API-Patches/0156-Material-API-additions.patch index 87f4ed92a7..b85a50975d 100644 --- a/Spigot-API-Patches/0155-Material-API-additions.patch +++ b/Spigot-API-Patches/0156-Material-API-additions.patch @@ -1,11 +1,11 @@ -From 9f8161e612c20011aefaab900ee328d011344ce7 Mon Sep 17 00:00:00 2001 +From e154dc606756149a2ec4d372ca3fcc02763636be Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 6 Oct 2018 21:14:29 -0400 Subject: [PATCH] Material API additions diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 14cae61f..39302434 100644 +index 387a0d7c..df5b0d38 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -72,6 +72,7 @@ import org.bukkit.material.MaterialData; diff --git a/Spigot-API-Patches/0156-Add-Material-Tags.patch b/Spigot-API-Patches/0157-Add-Material-Tags.patch similarity index 99% rename from Spigot-API-Patches/0156-Add-Material-Tags.patch rename to Spigot-API-Patches/0157-Add-Material-Tags.patch index 299f39624a..960b43e514 100644 --- a/Spigot-API-Patches/0156-Add-Material-Tags.patch +++ b/Spigot-API-Patches/0157-Add-Material-Tags.patch @@ -1,4 +1,4 @@ -From 7f7f48e6093d4bfccc6d43de03db277d08870593 Mon Sep 17 00:00:00 2001 +From c8d9c0624134b2d375f716b574d60c806367a650 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 17 Jul 2018 01:27:15 -0400 Subject: [PATCH] Add Material Tags diff --git a/Spigot-API-Patches/0157-Allow-setting-the-vex-s-summoner.patch b/Spigot-API-Patches/0158-Allow-setting-the-vex-s-summoner.patch similarity index 93% rename from Spigot-API-Patches/0157-Allow-setting-the-vex-s-summoner.patch rename to Spigot-API-Patches/0158-Allow-setting-the-vex-s-summoner.patch index 05d6b7a794..e4523a5cf5 100644 --- a/Spigot-API-Patches/0157-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-API-Patches/0158-Allow-setting-the-vex-s-summoner.patch @@ -1,4 +1,4 @@ -From 58c627929f89adfa0b2353bd1d9e01984e462b03 Mon Sep 17 00:00:00 2001 +From 0386e908841eba3bb839cf0369d23eabebb8b440 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 21:47:09 -0500 Subject: [PATCH] Allow setting the vex's summoner diff --git a/Spigot-API-Patches/0158-Add-LivingEntity-getTargetEntity.patch b/Spigot-API-Patches/0159-Add-LivingEntity-getTargetEntity.patch similarity index 98% rename from Spigot-API-Patches/0158-Add-LivingEntity-getTargetEntity.patch rename to Spigot-API-Patches/0159-Add-LivingEntity-getTargetEntity.patch index e5da342fc5..610d042645 100644 --- a/Spigot-API-Patches/0158-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-API-Patches/0159-Add-LivingEntity-getTargetEntity.patch @@ -1,4 +1,4 @@ -From c3cd722b840b3e0a65f7592c33897c9b9dee852c Mon Sep 17 00:00:00 2001 +From 5b16902a69bb432dfb8d97274e555db0a4b4593e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 00:32:53 -0500 Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/Spigot-API-Patches/0159-Add-sun-related-API.patch b/Spigot-API-Patches/0160-Add-sun-related-API.patch similarity index 95% rename from Spigot-API-Patches/0159-Add-sun-related-API.patch rename to Spigot-API-Patches/0160-Add-sun-related-API.patch index 90f375b23a..69ad69ea5d 100644 --- a/Spigot-API-Patches/0159-Add-sun-related-API.patch +++ b/Spigot-API-Patches/0160-Add-sun-related-API.patch @@ -1,4 +1,4 @@ -From 59d5938f6df932f95a46b64f5f436921ac4334ea Mon Sep 17 00:00:00 2001 +From c8019b1cd152eef680b20214289460008c9e6ebc Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:15 -0500 Subject: [PATCH] Add sun related API diff --git a/Spigot-API-Patches/0160-Here-s-Johnny.patch b/Spigot-API-Patches/0161-Here-s-Johnny.patch similarity index 96% rename from Spigot-API-Patches/0160-Here-s-Johnny.patch rename to Spigot-API-Patches/0161-Here-s-Johnny.patch index 6ee7cb03b9..a393d45c31 100644 --- a/Spigot-API-Patches/0160-Here-s-Johnny.patch +++ b/Spigot-API-Patches/0161-Here-s-Johnny.patch @@ -1,4 +1,4 @@ -From ce30c5582810d5202d0a72af02321e2a0ee1420c Mon Sep 17 00:00:00 2001 +From 4e522467653f5c36e8d56ecacc4761df3aaffa32 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 01:37:16 -0500 Subject: [PATCH] Here's Johnny! diff --git a/Spigot-API-Patches/0161-Turtle-API.patch b/Spigot-API-Patches/0162-Turtle-API.patch similarity index 99% rename from Spigot-API-Patches/0161-Turtle-API.patch rename to Spigot-API-Patches/0162-Turtle-API.patch index cc9376d7cb..29d113cb87 100644 --- a/Spigot-API-Patches/0161-Turtle-API.patch +++ b/Spigot-API-Patches/0162-Turtle-API.patch @@ -1,4 +1,4 @@ -From 853b766f604c2846ccace37753d58df97c8834b1 Mon Sep 17 00:00:00 2001 +From 75a0af25d86a09f7d0595a74b0e8fa36bc31cefc Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 28 Sep 2018 17:08:09 -0500 Subject: [PATCH] Turtle API diff --git a/Spigot-API-Patches/0162-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-API-Patches/0163-Implement-getters-and-setters-for-EntityItem-owner-a.patch similarity index 96% rename from Spigot-API-Patches/0162-Implement-getters-and-setters-for-EntityItem-owner-a.patch rename to Spigot-API-Patches/0163-Implement-getters-and-setters-for-EntityItem-owner-a.patch index 50ba78c42e..21c13693ae 100644 --- a/Spigot-API-Patches/0162-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-API-Patches/0163-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From 2c380e9b76d24bea7deef42af4e95bcf6e3fec2a Mon Sep 17 00:00:00 2001 +From 3de2f2a6f5cb2f4170ad57b5d3e777eb01dcc498 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 20:54:13 -0500 Subject: [PATCH] Implement getters and setters for EntityItem owner and diff --git a/Spigot-API-Patches/0163-Add-spectator-target-events.patch b/Spigot-API-Patches/0164-Add-spectator-target-events.patch similarity index 98% rename from Spigot-API-Patches/0163-Add-spectator-target-events.patch rename to Spigot-API-Patches/0164-Add-spectator-target-events.patch index 8a5ba4bb8d..5b5a7cdb75 100644 --- a/Spigot-API-Patches/0163-Add-spectator-target-events.patch +++ b/Spigot-API-Patches/0164-Add-spectator-target-events.patch @@ -1,4 +1,4 @@ -From fb900dc1cd53f7634e16210beac32550300cfc85 Mon Sep 17 00:00:00 2001 +From 19c3c18e12483a2c261ede1825cd2408bf3ee3b5 Mon Sep 17 00:00:00 2001 From: Caleb Bassham Date: Fri, 28 Sep 2018 02:30:56 -0500 Subject: [PATCH] Add spectator target events diff --git a/Spigot-API-Patches/0164-Add-more-Witch-API.patch b/Spigot-API-Patches/0165-Add-more-Witch-API.patch similarity index 95% rename from Spigot-API-Patches/0164-Add-more-Witch-API.patch rename to Spigot-API-Patches/0165-Add-more-Witch-API.patch index 597be7bd99..c26badf933 100644 --- a/Spigot-API-Patches/0164-Add-more-Witch-API.patch +++ b/Spigot-API-Patches/0165-Add-more-Witch-API.patch @@ -1,4 +1,4 @@ -From 3df85d0e4c57460cf7644e4acd0a42ce53bd05f6 Mon Sep 17 00:00:00 2001 +From e2fce2bde4ea1d8fc5335c5de982d933d770f5b1 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 03:47:26 -0500 Subject: [PATCH] Add more Witch API diff --git a/Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch b/Spigot-API-Patches/0166-Make-the-default-permission-message-configurable.patch similarity index 97% rename from Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch rename to Spigot-API-Patches/0166-Make-the-default-permission-message-configurable.patch index 4ce6fd19c3..165bba0ec5 100644 --- a/Spigot-API-Patches/0165-Make-the-default-permission-message-configurable.patch +++ b/Spigot-API-Patches/0166-Make-the-default-permission-message-configurable.patch @@ -1,4 +1,4 @@ -From c512125c7bdca9fbb124be26388fbc9bb820b91b Mon Sep 17 00:00:00 2001 +From bc3c78864ba112943c7d86ca3759deb413bef261 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 19:44:54 +0000 Subject: [PATCH] Make the default permission message configurable diff --git a/Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch b/Spigot-API-Patches/0167-Support-cancellation-supression-of-EntityDismount-Ve.patch similarity index 98% rename from Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch rename to Spigot-API-Patches/0167-Support-cancellation-supression-of-EntityDismount-Ve.patch index 3a6a74d65b..6e0ad3897e 100644 --- a/Spigot-API-Patches/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch +++ b/Spigot-API-Patches/0167-Support-cancellation-supression-of-EntityDismount-Ve.patch @@ -1,4 +1,4 @@ -From f09172180ea930533e2dfb629a6cd104ba613df4 Mon Sep 17 00:00:00 2001 +From 1484d7420d942becf9541480ff5a77dbc5a4e0e7 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 15:53:43 +0000 Subject: [PATCH] Support cancellation supression of EntityDismount/VehicleExit diff --git a/Spigot-API-Patches/0167-Add-more-Zombie-API.patch b/Spigot-API-Patches/0168-Add-more-Zombie-API.patch similarity index 96% rename from Spigot-API-Patches/0167-Add-more-Zombie-API.patch rename to Spigot-API-Patches/0168-Add-more-Zombie-API.patch index ce97cf147d..02287b310f 100644 --- a/Spigot-API-Patches/0167-Add-more-Zombie-API.patch +++ b/Spigot-API-Patches/0168-Add-more-Zombie-API.patch @@ -1,4 +1,4 @@ -From 565b1a1d7031594461aa7fac5a6a63eb1ff7f803 Mon Sep 17 00:00:00 2001 +From f432f757bef12b2fe5fa0100e812a3f6433c891c Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 04:29:51 -0500 Subject: [PATCH] Add more Zombie API diff --git a/Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch b/Spigot-API-Patches/0169-Change-the-reserved-channel-check-to-be-sensible.patch similarity index 96% rename from Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch rename to Spigot-API-Patches/0169-Change-the-reserved-channel-check-to-be-sensible.patch index f0980e6080..fef861c5bb 100644 --- a/Spigot-API-Patches/0168-Change-the-reserved-channel-check-to-be-sensible.patch +++ b/Spigot-API-Patches/0169-Change-the-reserved-channel-check-to-be-sensible.patch @@ -1,4 +1,4 @@ -From c607e328655c95d9773323d6c79c5e544ee27fe7 Mon Sep 17 00:00:00 2001 +From 4cc75cfb9c7d1963c112c51c58fd0e5e6f2afcb0 Mon Sep 17 00:00:00 2001 From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com> Date: Tue, 23 Oct 2018 19:32:55 +0300 Subject: [PATCH] Change the reserved channel check to be sensible diff --git a/Spigot-API-Patches/0169-Add-PlayerConnectionCloseEvent.patch b/Spigot-API-Patches/0170-Add-PlayerConnectionCloseEvent.patch similarity index 98% rename from Spigot-API-Patches/0169-Add-PlayerConnectionCloseEvent.patch rename to Spigot-API-Patches/0170-Add-PlayerConnectionCloseEvent.patch index ee61a29139..54a932d350 100644 --- a/Spigot-API-Patches/0169-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-API-Patches/0170-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From f0efe7dcddc56cd20983c541c42537f1d78f7b0b Mon Sep 17 00:00:00 2001 +From b3c5a341cc4f504868ebc181f2396dd4b4db4d03 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 7 Oct 2018 12:05:06 -0700 Subject: [PATCH] Add PlayerConnectionCloseEvent diff --git a/Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-API-Patches/0171-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 97% rename from Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to Spigot-API-Patches/0171-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index 7680a5eb96..917f8c1396 100644 --- a/Spigot-API-Patches/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-API-Patches/0171-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -1,4 +1,4 @@ -From aa3efefb9b8b1ffba66ad5ea00c9acd76c6d6a49 Mon Sep 17 00:00:00 2001 +From 3eddb9b4bba48acf8e104d0df6fe67cb5be7167d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Jan 2019 00:31:12 -0600 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch index 88d8abb381..b476c10e27 100644 --- a/Spigot-Server-Patches/0004-MC-Utils.patch +++ b/Spigot-Server-Patches/0004-MC-Utils.patch @@ -1,31 +1,11 @@ -From 90cb0ca1d5b47eb2ce7ffa93f10a1cae149ddfad Mon Sep 17 00:00:00 2001 +From 25ddde677b4051af98030f03f77dd89ef19ca66a Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:55:47 -0400 Subject: [PATCH] MC Utils -diff --git a/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java -new file mode 100644 -index 000000000..e58509675 ---- /dev/null -+++ b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java -@@ -0,0 +1,14 @@ -+package com.destroystokyo.paper.util; -+ -+public class SneakyThrow { -+ -+ public static void sneaky(Throwable exception) { -+ SneakyThrow.throwSneaky(exception); -+ } -+ -+ @SuppressWarnings("unchecked") -+ private static void throwSneaky(Throwable exception) throws T { -+ throw (T) exception; -+ } -+ -+} diff --git a/src/main/java/net/minecraft/server/AttributeInstance.java b/src/main/java/net/minecraft/server/AttributeInstance.java -index be179ba21..c53bc8230 100644 +index be179ba213..c53bc8230a 100644 --- a/src/main/java/net/minecraft/server/AttributeInstance.java +++ b/src/main/java/net/minecraft/server/AttributeInstance.java @@ -21,8 +21,10 @@ public interface AttributeInstance { @@ -40,7 +20,7 @@ index be179ba21..c53bc8230 100644 void b(UUID uuid); diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 330f5d0c1..37f9037a2 100644 +index 330f5d0c19..37f9037a22 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -45,6 +45,7 @@ public class BlockPosition extends BaseBlockPosition { @@ -76,7 +56,7 @@ index 330f5d0c1..37f9037a2 100644 return this.c(MathHelper.floor(d0), MathHelper.floor(d1), MathHelper.floor(d2)); } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 1ff78eed4..417c015e5 100644 +index 1ff78eed40..417c015e56 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -31,7 +31,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent; @@ -97,7 +77,7 @@ index 1ff78eed4..417c015e5 100644 public TileEntity a(BlockPosition blockposition, Chunk.EnumTileEntityState chunk_enumtileentitystate) { // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java -index 34586bca6..b0c004b1f 100644 +index 34586bca65..b0c004b1f2 100644 --- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java +++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java @@ -24,6 +24,8 @@ public class ChunkCoordIntPair { @@ -110,7 +90,7 @@ index 34586bca6..b0c004b1f 100644 return (long) i & 4294967295L | ((long) j & 4294967295L) << 32; } diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java -index cc9604749..70a95c263 100644 +index cc9604749b..70a95c2636 100644 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java @@ -13,7 +13,7 @@ import org.apache.logging.log4j.Logger; @@ -123,7 +103,7 @@ index cc9604749..70a95c263 100644 private final IChunkLoader e; private final IAsyncTaskHandler f; diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java -index d24ec3d53..9e83610f1 100644 +index d24ec3d53c..9e83610f1a 100644 --- a/src/main/java/net/minecraft/server/DataBits.java +++ b/src/main/java/net/minecraft/server/DataBits.java @@ -60,6 +60,7 @@ public class DataBits { @@ -135,7 +115,7 @@ index d24ec3d53..9e83610f1 100644 return this.a; } diff --git a/src/main/java/net/minecraft/server/DataPalette.java b/src/main/java/net/minecraft/server/DataPalette.java -index dae40b9cd..2ee879196 100644 +index dae40b9cde..2ee8791963 100644 --- a/src/main/java/net/minecraft/server/DataPalette.java +++ b/src/main/java/net/minecraft/server/DataPalette.java @@ -4,8 +4,10 @@ import javax.annotation.Nullable; @@ -150,7 +130,7 @@ index dae40b9cd..2ee879196 100644 T a(int i); diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index 59cbbdcb3..6fcfc5ef7 100644 +index 59cbbdcb3d..6fcfc5ef72 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -8,7 +8,7 @@ import java.util.stream.Collectors; @@ -192,7 +172,7 @@ index 59cbbdcb3..6fcfc5ef7 100644 this.b(); packetdataserializer.writeByte(this.i); diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java -index 372afbe94..20b7c2c6d 100644 +index 372afbe94e..20b7c2c6dc 100644 --- a/src/main/java/net/minecraft/server/EntityCreature.java +++ b/src/main/java/net/minecraft/server/EntityCreature.java @@ -6,6 +6,7 @@ import org.bukkit.event.entity.EntityUnleashEvent; @@ -204,7 +184,7 @@ index 372afbe94..20b7c2c6d 100644 private float b; diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index a3d088bbd..cca047b04 100644 +index 8b2000f683..1a3517aeed 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -125,6 +125,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -216,7 +196,7 @@ index a3d088bbd..cca047b04 100644 // CraftBukkit start - fire event setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 892e1aca7..ed859ccf9 100644 +index 892e1aca7e..ed859ccf95 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -122,6 +122,7 @@ public abstract class EntityLiving extends Entity { @@ -228,7 +208,7 @@ index 892e1aca7..ed859ccf9 100644 @Override public float getBukkitYaw() { diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java -index 5f9255df1..5ea517043 100644 +index 5f9255df14..5ea5170436 100644 --- a/src/main/java/net/minecraft/server/EntityMonster.java +++ b/src/main/java/net/minecraft/server/EntityMonster.java @@ -2,11 +2,13 @@ package net.minecraft.server; @@ -246,7 +226,7 @@ index 5f9255df1..5ea517043 100644 return SoundCategory.HOSTILE; } diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index b8abd6363..a07ee150c 100644 +index b8abd6363f..a07ee150c2 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -3,6 +3,7 @@ package net.minecraft.server; @@ -297,7 +277,7 @@ index b8abd6363..a07ee150c 100644 // Paper end } diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 53511f0cc..d1267f3d7 100644 +index 53511f0cc6..d1267f3d72 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -578,6 +578,17 @@ public final class ItemStack { @@ -328,7 +308,7 @@ index 53511f0cc..d1267f3d7 100644 } diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java new file mode 100644 -index 000000000..c97e116aa +index 0000000000..c97e116aaf --- /dev/null +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -0,0 +1,316 @@ @@ -649,7 +629,7 @@ index 000000000..c97e116aa + } +} diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java -index 434471215..8c5d6c1d3 100644 +index 434471215d..8c5d6c1d38 100644 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java @@ -23,7 +23,7 @@ public class NBTTagCompound implements NBTBase { @@ -676,7 +656,7 @@ index 434471215..8c5d6c1d3 100644 public UUID a(String s) { return new UUID(this.getLong(s + "Most"), this.getLong(s + "Least")); diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index d85bc522c..e2fc41d6d 100644 +index d85bc522c3..e2fc41d6d1 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -43,7 +43,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -717,7 +697,7 @@ index d85bc522c..e2fc41d6d 100644 public QueuedPacket(Packet packet, @Nullable GenericFutureListener> genericfuturelistener) { this.a = packet; diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java -index 7582151ae..d05f1e02c 100644 +index 7582151ae4..d05f1e02cf 100644 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java @@ -33,6 +33,7 @@ public class PacketDataSerializer extends ByteBuf { @@ -729,7 +709,7 @@ index 7582151ae..d05f1e02c 100644 for (int j = 1; j < 5; ++j) { if ((i & -1 << j * 7) == 0) { diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java -index d54177bdc..2aa805eef 100644 +index d54177bdcc..2aa805eef1 100644 --- a/src/main/java/net/minecraft/server/PacketEncoder.java +++ b/src/main/java/net/minecraft/server/PacketEncoder.java @@ -42,6 +42,7 @@ public class PacketEncoder extends MessageToByteEncoder> { @@ -741,7 +721,7 @@ index d54177bdc..2aa805eef 100644 throw new SkipEncodeException(throwable); } else { diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 395215bbd..f2159bc2d 100644 +index 395215bbdd..f2159bc2dd 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -13,7 +13,7 @@ public class PacketPlayOutMapChunk implements Packet { @@ -762,7 +742,7 @@ index 395215bbd..f2159bc2d 100644 int j = 0; ChunkSection[] achunksection = chunk.getSections(); diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index d627f975b..08d1b859d 100644 +index 55b4d57af4..a2ec56bc90 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -67,9 +67,9 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -779,7 +759,7 @@ index d627f975b..08d1b859d 100644 private volatile int chatThrottle; private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle"); diff --git a/src/main/java/net/minecraft/server/PotionUtil.java b/src/main/java/net/minecraft/server/PotionUtil.java -index 6740b396a..ea08c5a1c 100644 +index 6740b396a1..ea08c5a1c8 100644 --- a/src/main/java/net/minecraft/server/PotionUtil.java +++ b/src/main/java/net/minecraft/server/PotionUtil.java @@ -110,6 +110,7 @@ public class PotionUtil { @@ -791,7 +771,7 @@ index 6740b396a..ea08c5a1c 100644 MinecraftKey minecraftkey = IRegistry.POTION.getKey(potionregistry); diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java -index a894f7886..93935e7c7 100644 +index a894f7886d..93935e7c77 100644 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java @@ -56,6 +56,7 @@ public class RegistryBlockID implements Registry { @@ -803,7 +783,7 @@ index a894f7886..93935e7c7 100644 return this.b.size(); } diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java -index 8cb97b894..5e71d2ac2 100644 +index 8cb97b894a..5e71d2ac27 100644 --- a/src/main/java/net/minecraft/server/SystemUtils.java +++ b/src/main/java/net/minecraft/server/SystemUtils.java @@ -35,8 +35,8 @@ public class SystemUtils {