Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@1e5d1db Call StructureGrowEvent for mangrove propagule (#8023)
PaperMC/Paper@385f313 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8092)
PaperMC/Paper@fbb11db Add missing EntityDropItemEvent calls (#5674)
PaperMC/Paper@c879064 Call EntityDropItemEvent for goats dropping horns (#8094)
This commit is contained in:
BillyGalbreath
2022-07-04 15:39:33 -05:00
parent d1485fa5b6
commit ff0bea3098
40 changed files with 137 additions and 137 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 320e4697236b743ffe4e32c0e73b82c3e6896683..b3c68150034d8944da00d77dd5a8aa21a025d678 100644
index 9ae019a2d8274bdfb5e788cb7aec03bbcbaa7c26..a2f9b8b4a66af1dcb62a0b04bd6b5a447fac6439 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2422,5 +2422,14 @@ public final class Bukkit {
@@ -2439,5 +2439,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 320e4697236b743ffe4e32c0e73b82c3e6896683..b3c68150034d8944da00d77dd5a8aa21
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 3bb33271ecb6021e34db92127964579eaf5c54ff..80e3a94c4c67252351dbf97ef4255c49faf72c60 100644
index 6cbd3636c01dc66125d5049b85205590af202605..1aca80c46a5ab3039ee2e42c6d28b46f141c501a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2110,5 +2110,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2125,5 +2125,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();