Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0041-Added-the-ability-to-add-combustible-items.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Added the ability to add combustible items
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index b3c68150034d8944da00d77dd5a8aa21a025d678..9222adc75b68b9a899b4eca2a1803844b9cdbe26 100644
index a2f9b8b4a66af1dcb62a0b04bd6b5a447fac6439..9b9af189b3865055570ba533b97c92c105cc5a37 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2431,5 +2431,24 @@ public final class Bukkit {
@@ -2448,5 +2448,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index b3c68150034d8944da00d77dd5a8aa21a025d678..9222adc75b68b9a899b4eca2a1803844
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 80e3a94c4c67252351dbf97ef4255c49faf72c60..1ba84f8db9d279f5fb2b4be10c02919bb27de30a 100644
index 1aca80c46a5ab3039ee2e42c6d28b46f141c501a..d73b7d72d00fa0edd6542226348af14c5203cf8d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2117,5 +2117,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2132,5 +2132,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();