Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47: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@c95bc5f Don't unpack loot table for TEs not in world (#9918)
PaperMC/Paper@6675d13 Fix strikeLightningEffect powers lightning rods & clears copper (#9780)
PaperMC/Paper@63e77b5 Add Enchantment cost API (#9856)
PaperMC/Paper@d8847bc Updated Upstream (Bukkit/CraftBukkit) (#9922)
PaperMC/Paper@dd47ec6 Add Entity Movement Direction API (#7085)
PaperMC/Paper@9ee60ec Add aggressive mob API (#9838)
PaperMC/Paper@531ef27 Use ApiStatus.Internal instead of Deprecated (#9042)
PaperMC/Paper@9548629 Add hand to fish event for all player interactions (#9929)
PaperMC/Paper@aee3830 Deprecate Material#isInteractable (#9216)
PaperMC/Paper@a506b48 Fix several issues with EntityBreedEvent (#8677)
PaperMC/Paper@f186318 Run the chat callback on the main thread as expected (#9935)
This commit is contained in:
granny
2023-11-12 01:44:08 -08:00
parent ea2835bfe1
commit 1adf78b91a
41 changed files with 147 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 222dcb75a850d224ac22b2e06895233527cffc76..584e3b08935f43beb27f478cc72229b6a5f40689 100644
index 4127ae56afb05196ff46a5313e9d141adc27802b..c5956d747a09c192355c17a52f7bfa9e333c4e72 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2794,5 +2794,89 @@ public final class Bukkit {
@@ -2870,5 +2870,89 @@ public final class Bukkit {
public static void removeFuel(@NotNull Material material) {
server.removeFuel(material);
}
@@ -99,10 +99,10 @@ index 222dcb75a850d224ac22b2e06895233527cffc76..584e3b08935f43beb27f478cc72229b6
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 3bc9fa8b68b284516ddbf0ace0c1dc52768307cb..aaef58468a3c31f35e5067ed4263e9dd3fbddddd 100644
index 6795f2c0c1e974c4fe3181cd6838a68f7437c846..7eae8683c0d540ba049dddaed8737e051d6f60db 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2446,5 +2446,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2515,5 +2515,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @param material The material that will no longer be a fuel
*/
public void removeFuel(@NotNull Material material);
@@ -179,7 +179,7 @@ index 3bc9fa8b68b284516ddbf0ace0c1dc52768307cb..aaef58468a3c31f35e5067ed4263e9dd
// Purpur end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 791ab7aa9cb36715a323e8b920bb67f30accf738..b012cc979e38ef1ef1ec61e71a887b91eb3de223 100644
index 6fa89b11548da3d6be8cd92466f3853c1b409afc..cf63054e1b597b2bb13164722dd9a829ba7069ba 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
@@ -260,10 +260,10 @@ index 791ab7aa9cb36715a323e8b920bb67f30accf738..b012cc979e38ef1ef1ec61e71a887b91
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index f1485aedb9d581bca9daa7bf94876a35e7f055bc..23efdf3729f26554a1045e4d098fece5fc97c7ba 100644
index 0660f7d98f1d0cbd6442df8e01d6c72b5a395c15..8d5ff090957e924fa513928d39c5917f3c64eca5 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3338,5 +3338,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3335,5 +3335,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @deprecated Use {@link #resetIdleDuration()} instead
*/
void resetIdleTimer();