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
This commit is contained in:
Aikar
2020-05-01 18:03:47 -04:00
parent a6a197b11f
commit 57dd397155
699 changed files with 1945 additions and 1938 deletions

View File

@@ -1,11 +1,11 @@
From 8ee6c03819b3128a206f5a5a73002bd719baf25b Mon Sep 17 00:00:00 2001
From 49584133dc28884b641698f3b8996b0b1d60642c Mon Sep 17 00:00:00 2001
From: Trigary <trigary0@gmail.com>
Date: Wed, 15 Apr 2020 01:24:55 -0400
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
@@ -52,6 +52,8 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -58,5 +58,5 @@ index 8ff228ce..ba2c5c6e 100644
}
--
2.25.1
2.26.2