Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
2020-05-01 18:03:47 -04:00
parent 964408d7d9
commit b06cb423cb
372 changed files with 652 additions and 647 deletions
--- a/Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch
+++ b/Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization

 diff --git a/pom.xml b/pom.xml
-index ce09baeab..3cfbff14b 100644
+index 9975ba9ae..e8d9982bd 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-Player-Client-Options-API.patch
+++ b/Spigot-API-Patches/Add-Player-Client-Options-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Player Client Options API

 diff --git a/src/main/java/com/destroystokyo/paper/ClientOption.java b/src/main/java/com/destroystokyo/paper/ClientOption.java
 new file mode 100644
-index 00000000..9dad814c
+index 000000000..9dad814cf
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/ClientOption.java
@@ -0,0 +0,0 @@
@@ -45,7 +45,7 @@ index 00000000..9dad814c
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/SkinParts.java b/src/main/java/com/destroystokyo/paper/SkinParts.java
 new file mode 100644
-index 00000000..4a0c3940
+index 000000000..4a0c39405
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/SkinParts.java
@@ -0,0 +0,0 @@
@@ -71,7 +71,7 @@ index 00000000..4a0c3940
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java
 new file mode 100644
-index 00000000..f7f171c4
+index 000000000..f7f171c4e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerClientOptionsChangeEvent.java
@@ -0,0 +0,0 @@
@@ -176,7 +176,7 @@ index 00000000..f7f171c4
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 3600b4c8..787bb144 100644
+index 3600b4c84..787bb144b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/Spigot-API-Patches/Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent

 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerAttackEntityCooldownResetEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerAttackEntityCooldownResetEvent.java
 new file mode 100644
-index 00000000..ebdebe7b
+index 000000000..ebdebe7b6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerAttackEntityCooldownResetEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-PlayerInitialSpawnEvent.patch
+++ b/Spigot-API-Patches/Add-PlayerInitialSpawnEvent.patch
@@ -7,7 +7,7 @@ For modifying a player's initial spawn location as they join the server

 diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
 new file mode 100644
-index 00000000..8b1fdb9d
+index 000000000..8b1fdb9d2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Add-method-to-open-already-placed-sign.patch
+++ b/Spigot-API-Patches/Add-method-to-open-already-placed-sign.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to open already placed sign


 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 3adff676..2d413d72 100644
+index 3adff676c..2d413d720 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -0,0 +0,0 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
--- a/Spigot-API-Patches/Add-tick-times-API.patch
+++ b/Spigot-API-Patches/Add-tick-times-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add tick times API


 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b9973406..c3c2d9c6 100644
+index b99734068..c3c2d9c6b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -0,0 +0,0 @@ public final class Bukkit {
@@ -35,7 +35,7 @@ index b9973406..c3c2d9c6 100644
 
     /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 80f9abdc..bfa83c9b 100644
+index 80f9abdca..bfa83c9bb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
--- a/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/Spigot-API-Patches/Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -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 3712b70bc..2cb971408 100644
+index 661d109f7..20c473f52 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
+++ b/Spigot-API-Patches/Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix Potion#toItemStack swapping the extended and upgraded
 While the Potion class is deprecated, it is still used in some plugins for cross-version potion handling. This issue has existed for a long time, and has caused many heaches along the way.

 diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java
-index b9dbbfd0..ac02ae4f 100644
+index b9dbbfd07..ac02ae4fc 100644
 --- a/src/main/java/org/bukkit/potion/Potion.java
 +++ b/src/main/java/org/bukkit/potion/Potion.java
@@ -0,0 +0,0 @@ public class Potion {
@@ -19,6 +19,4 @@ index b9dbbfd0..ac02ae4f 100644
         itemStack.setItemMeta(meta);
         return itemStack;
     }
-- 
-2.21.0 (Apple Git-122)
-
+--
--- a/Spigot-API-Patches/Increase-custom-payload-channel-message-size.patch
+++ b/Spigot-API-Patches/Increase-custom-payload-channel-message-size.patch
@@ -7,7 +7,7 @@ Doubles the custom payload size limit imposed by bukkit, also creates a system
 property to allow customizing the size `paper.maxCustomChannelName`

 diff --git a/src/main/java/org/bukkit/plugin/messaging/Messenger.java b/src/main/java/org/bukkit/plugin/messaging/Messenger.java
-index 9d2c68c8..682c7718 100644
+index 9d2c68c82..682c77188 100644
 --- a/src/main/java/org/bukkit/plugin/messaging/Messenger.java
 +++ b/src/main/java/org/bukkit/plugin/messaging/Messenger.java
@@ -0,0 +0,0 @@ public interface Messenger {
--- a/Spigot-API-Patches/InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-API-Patches/InventoryCloseEvent-Reason-API.patch
@@ -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 cdbac95bb..f25c73155 100644
+index 2d413d720..79569a329 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -0,0 +0,0 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
--- a/Spigot-API-Patches/Make-JavaPluginLoader-thread-safe.patch
+++ b/Spigot-API-Patches/Make-JavaPluginLoader-thread-safe.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make JavaPluginLoader thread-safe


 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 8ff228ce..ba2c5c6e 100644
+index 8ff228ced..ba2c5c6ee 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
--- a/Spigot-API-Patches/Make-PlayerEvent-public.patch
+++ b/Spigot-API-Patches/Make-PlayerEvent-public.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make PlayerEvent public


 diff --git a/src/main/java/org/bukkit/event/player/PlayerEvent.java b/src/main/java/org/bukkit/event/player/PlayerEvent.java
-index 793b661b..b7c8f2c3 100644
+index 793b661b6..b7c8f2c31 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerEvent.java
@@ -0,0 +0,0 @@ public abstract class PlayerEvent extends Event {
--- a/Spigot-API-Patches/POM-changes.patch
+++ b/Spigot-API-Patches/POM-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] POM changes


 diff --git a/pom.xml b/pom.xml
-index 186405ba..9975ba9a 100644
+index 186405ba1..9975ba9ae 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -0,0 +0,0 @@
--- a/Spigot-API-Patches/Shoulder-Entities-Release-API.patch
+++ b/Spigot-API-Patches/Shoulder-Entities-Release-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Shoulder Entities Release API


 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index a7f08bb1..3adff676 100644
+index a7f08bb1c..3adff676c 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -0,0 +0,0 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
--- a/Spigot-API-Patches/Use-ASM-for-event-executors.patch
+++ b/Spigot-API-Patches/Use-ASM-for-event-executors.patch
@@ -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 e8d9982b..661d109f 100644
+index e8d9982bd..661d109f7 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -0,0 +0,0 @@
@@ -29,7 +29,7 @@ index e8d9982b..661d109f 100644
     <build>
 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 00000000..5b28e9b1
+index 000000000..5b28e9b1d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
@@ -0,0 +0,0 @@
@@ -77,7 +77,7 @@ index 00000000..5b28e9b1
 +}
 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 00000000..c8367242
+index 000000000..c83672427
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
@@ -0,0 +0,0 @@
@@ -126,7 +126,7 @@ index 00000000..c8367242
 +}
 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 00000000..b6e7d8ee
+index 000000000..b6e7d8ee8
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
@@ -0,0 +0,0 @@
@@ -179,7 +179,7 @@ index 00000000..b6e7d8ee
 +}
 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 00000000..beed9e6e
+index 000000000..beed9e6e0
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
@@ -0,0 +0,0 @@
@@ -220,7 +220,7 @@ index 00000000..beed9e6e
 +}
 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 00000000..ac99477e
+index 000000000..ac99477e9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
@@ -0,0 +0,0 @@
@@ -292,7 +292,7 @@ index 00000000..ac99477e
 +}
 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 00000000..72e48e8e
+index 000000000..72e48e8ef
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
@@ -0,0 +0,0 @@
@@ -332,7 +332,7 @@ index 00000000..72e48e8e
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
-index a850f078..9026e108 100644
+index a850f0780..9026e108c 100644
 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java
 +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java
@@ -0,0 +0,0 @@ import org.bukkit.event.EventException;
@@ -412,7 +412,7 @@ index a850f078..9026e108 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 5cc37eee..e72cbde4 100644
+index 5cc37eeed..e72cbde4b 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -0,0 +0,0 @@ public final class JavaPluginLoader implements PluginLoader {
--- a/Spigot-API-Patches/Villager-Restocks-API.patch
+++ b/Spigot-API-Patches/Villager-Restocks-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Villager Restocks API


 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index ef48ad9b..d1579153 100644
+index ef48ad9b2..d15791530 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
@@ -0,0 +0,0 @@ public interface Villager extends AbstractVillager {