Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 10:18:16 +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@eda3d53 [ci skip] Improve PlayerChatEvent Deprecation Message (#9956)
PaperMC/Paper@e1cd9e5 Update paperweight to 1.5.10 and Gradle to 8.4 (#9957)
PaperMC/Paper@96d5e6c Code Generation for TypedKeys (#9233)
PaperMC/Paper@ed753d3 Re-add missing vanilla safeMode arg
PaperMC/Paper@334b2f2 Fix max nearby entities class check (#9967)
PaperMC/Paper@faa2f47 Lazily create LootContext for criterions (#9969)
PaperMC/Paper@8280211 Fix yaw being ignored for first spawn pos (#9959)
PaperMC/Paper@8eac3e1 Don't fire EntityPotionEffectEvent during worldgen (#9965)
PaperMC/Paper@0b20f94 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9953)
PaperMC/Paper@f9938d3 Fix plugin bootstrap dependency tree population (#9963)
PaperMC/Paper@b37bbcf Use ? super in Consumer/Predicate API (#9939)
This commit is contained in:
granny
2023-11-26 22:27:27 -08:00
parent 4b1a082c94
commit c46cb7ef66
35 changed files with 122 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/api/0044-Debug-Marker-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Debug Marker API
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 4127ae56afb05196ff46a5313e9d141adc27802b..c5956d747a09c192355c17a52f7bfa9e333c4e72 100644
index 4d375b95459698284f1c27eefe8adc29fc0e7871..8ea42a1f07df756bf504609d2bbff578f20bb808 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2870,5 +2870,89 @@ public final class Bukkit {
@@ -99,7 +99,7 @@ index 4127ae56afb05196ff46a5313e9d141adc27802b..c5956d747a09c192355c17a52f7bfa9e
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6795f2c0c1e974c4fe3181cd6838a68f7437c846..7eae8683c0d540ba049dddaed8737e051d6f60db 100644
index 9217a021cd6e54fda334f637a0bfbbdbc7ad14b0..dd99f53e3d559685a4b3a454a9e607c310fc6aff 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2515,5 +2515,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -179,10 +179,10 @@ index 6795f2c0c1e974c4fe3181cd6838a68f7437c846..7eae8683c0d540ba049dddaed8737e05
// Purpur end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 6fa89b11548da3d6be8cd92466f3853c1b409afc..cf63054e1b597b2bb13164722dd9a829ba7069ba 100644
index 1e794f6d2765d3e2c40b15a9699d181ffe12c2f5..2f1adae519e45743828be06df15b5f33045ae18b 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -4168,6 +4168,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -4219,6 +4219,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
* @return The local difficulty
*/
public float getLocalDifficultyAt(@NotNull Location location);
@@ -260,10 +260,10 @@ index 6fa89b11548da3d6be8cd92466f3853c1b409afc..cf63054e1b597b2bb13164722dd9a829
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 0660f7d98f1d0cbd6442df8e01d6c72b5a395c15..8d5ff090957e924fa513928d39c5917f3c64eca5 100644
index b66402df0d602ef33bf8742504f35c095041dfe3..2543299cbd94f409606dddb5969123909d11d1ac 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3335,5 +3335,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3398,5 +3398,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @deprecated Use {@link #resetIdleDuration()} instead
*/
void resetIdleTimer();