Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-06-21 09:47:45 +02: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@f53a8042 drop previous block from sulfur cube after swap
PaperMC/Paper@37d9857b Call ExplosionPrimeEvent / EntityUnleashEvent for Sulfur Cube (#13935)
PaperMC/Paper@58cfde23 make sulfur cube ageable
PaperMC/Paper@a4e7b2f6 fix abi break for blockdata
PaperMC/Paper@3a05566b improve damage cause heuristics
PaperMC/Paper@3ec423fb Call EntityDamageByEntityEvent for SulfurCube's contact damage (#13937)
PaperMC/Paper@2c1ecaec merge hot floor and campfire damage cause to contact
PaperMC/Paper@273c92d8 support markdown javadoc in generator
This commit is contained in:
granny
2026-06-06 22:59:52 -07:00
parent a857d511b9
commit da23f92836
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
purpur-api/paper-patches/features/0002-Purpur-config-files.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index b7f4c4efad7335d1c02d1315c64ba9953f3f05c9..81484f52feea2ccf8b9e7c791b976561a1a3e5f6 100644
index 1f012a7c5c3129c1dcaacb5377051c6285b3486a..8805b385dd7c123d3de74520ca2ba702ea351b00 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2443,6 +2443,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2440,6 +2440,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Paper end

4
purpur-api/paper-patches/files/src/main/java/co/aikar/timings/TimedEventExecutor.java.patch
View File

@@ -4,8 +4,8 @@
executor.execute(listener, event);
return;
}
- try (Timing ignored = timings.startTiming()){
+ //try (Timing ignored = timings.startTiming()){ // Purpur - Remove Timings
- try (Timing ignored = timings.startTiming()) {
+ //try (Timing ignored = timings.startTiming()) { // Purpur - Remove Timings
executor.execute(listener, event);
- }
+ //} // Purpur - Remove Timings

2
purpur-api/paper-patches/files/src/main/java/org/bukkit/Server.java.patch
View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2779,4 +_,125 @@
@@ -2776,4 +_,125 @@
*/
void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
// Paper end - API to check if the server is sleeping

10
purpur-api/paper-patches/files/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java.patch
View File

@@ -1,12 +1,12 @@
--- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
@@ -310,7 +_,8 @@
@@ -311,7 +_,8 @@
WORLD_BORDER,
/**
* Damage caused when an entity contacts a block such as a Cactus,
- * Dripstone (Stalagmite) or Berry Bush.
+ * Dripstone (Stalagmite) or Berry Bush. (Stonecutters too if you
+ * have the Stonecutter damage Purpur feature enabled)
* Damage caused when an entity contacts another entity (sulfur cube) or block (cactus, dripstone stalagmite,
- * berry bush, campfire, magma block).
+ * berry bush, campfire, magma block). (Stonecutters too if you have the Stonecutter damage Purpur feature
+ * enabled)
* <p>
* Damage: variable
*/