Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17: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@ab7bc3f Remove javadoc that doesn't apply to Paper (#9206)
PaperMC/Paper@57fdc66 Undeprecate Server#getMap (#9185)
PaperMC/Paper@f8603a4 Avoid Lazy Initialization for Enum Fields (#9210)
PaperMC/Paper@5b66d33 Call EntityChangeBlockEvent for frogs egg (#9213)
PaperMC/Paper@4ba5aac More accurate isInOpenWater impl (#9194)
PaperMC/Paper@a61b484 Fix MC-224454 (#9195)
PaperMC/Paper@b681760 Fix note block sound property on player heads (#9158)
PaperMC/Paper@bcd8dc2 Use the spigot config for mangrove propagule / torchflower growth (#8597)
This commit is contained in:
granny
2023-05-16 13:12:04 -07:00
parent b84222981c
commit 3b02c0439a
11 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0004-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 8621dba7f10ab822b5b99ce0d05da58823605cb6..2c989eda18c0aa67eb552fe38b6482e91887d5e5 100644
index 9f7029d327b55c8b1b9cfef8ea2678b87dad8ddb..8d9f66b376e2eb903f1cb8ff68055edc08db22c5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1968,6 +1968,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1967,6 +1967,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Paper end

8
patches/api/0011-Bring-back-server-name.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f1af93319d6b29d7bc709e7e273e8abe26c7b4af..5c581193cad7a80056b63fc0406001ec4a0c37ed 100644
index 15a9993c2705e2dcc0366394ded57acffab589c0..15a4a8d2e6205f4d25f4dcc5218281197cd42732 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2461,4 +2461,15 @@ public final class Bukkit {
@@ -2460,4 +2460,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index f1af93319d6b29d7bc709e7e273e8abe26c7b4af..5c581193cad7a80056b63fc0406001ec
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 2c989eda18c0aa67eb552fe38b6482e91887d5e5..3e4ddcc1320eff2be4539f134f15951aaa4fcc8a 100644
index 8d9f66b376e2eb903f1cb8ff68055edc08db22c5..bb2524790008e3b90b16977076d9bb4c8b1461ba 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2148,4 +2148,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2147,4 +2147,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
// Paper end

8
patches/api/0014-Lagging-threshold.patch
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 5c581193cad7a80056b63fc0406001ec4a0c37ed..29f98336de10e2af1ef15d0f0d29796076d008e1 100644
index 15a4a8d2e6205f4d25f4dcc5218281197cd42732..a2ee324d32c48fa9d71768f9b1cf7efcae02a01d 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2471,5 +2471,14 @@ public final class Bukkit {
@@ -2470,5 +2470,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 5c581193cad7a80056b63fc0406001ec4a0c37ed..29f98336de10e2af1ef15d0f0d297960
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 3e4ddcc1320eff2be4539f134f15951aaa4fcc8a..d6f126d4f9f84c013b4c9320a38a66c6bab12d8c 100644
index bb2524790008e3b90b16977076d9bb4c8b1461ba..d16c5f0bd920291311ccf9870463aaaa98661578 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2156,5 +2156,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2155,5 +2155,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();

8
patches/api/0025-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add predicate to recipe's ExactChoice ingredient
diff --git a/src/main/java/org/bukkit/inventory/RecipeChoice.java b/src/main/java/org/bukkit/inventory/RecipeChoice.java
index 90208bc96085f05a3b657b9467b1670d00b03104..c59d5e4ef9641fd73463b177239226866272745b 100644
index 523818cbb0d6c90481ec97123e7fe0e2ff4eea14..bfeb8171a723d84b94bfaacd8aaf7d4d48ecd051 100644
--- a/src/main/java/org/bukkit/inventory/RecipeChoice.java
+++ b/src/main/java/org/bukkit/inventory/RecipeChoice.java
@@ -10,6 +10,7 @@ import java.util.function.Predicate;
@@ -16,7 +16,7 @@ index 90208bc96085f05a3b657b9467b1670d00b03104..c59d5e4ef9641fd73463b17723922686
/**
* Represents a potential item match within a recipe. All choices within a
@@ -152,6 +153,7 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
@@ -150,6 +151,7 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
public static class ExactChoice implements RecipeChoice {
private List<ItemStack> choices;
@@ -24,7 +24,7 @@ index 90208bc96085f05a3b657b9467b1670d00b03104..c59d5e4ef9641fd73463b17723922686
public ExactChoice(@NotNull ItemStack stack) {
this(Arrays.asList(stack));
@@ -196,6 +198,7 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
@@ -194,6 +196,7 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
@Override
public boolean test(@NotNull ItemStack t) {
@@ -32,7 +32,7 @@ index 90208bc96085f05a3b657b9467b1670d00b03104..c59d5e4ef9641fd73463b17723922686
for (ItemStack match : choices) {
if (t.isSimilar(match)) {
return true;
@@ -205,6 +208,17 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
@@ -203,6 +206,17 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
return false;
}

8
patches/api/0038-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 29f98336de10e2af1ef15d0f0d29796076d008e1..83e1360397ec257719c0e1f8734d57daece76a0e 100644
index a2ee324d32c48fa9d71768f9b1cf7efcae02a01d..72e8e8ff651cf254e0fe3a8927272ea8da0f5f5a 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2480,5 +2480,24 @@ public final class Bukkit {
@@ -2479,5 +2479,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index 29f98336de10e2af1ef15d0f0d29796076d008e1..83e1360397ec257719c0e1f8734d57da
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index d6f126d4f9f84c013b4c9320a38a66c6bab12d8c..b2184f33f8b34ae484357742690e205accaa635f 100644
index d16c5f0bd920291311ccf9870463aaaa98661578..8b53a9149f655870ebc1c912eeb9fecbcb4836b8 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2163,5 +2163,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2162,5 +2162,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();

8
patches/api/0046-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 83e1360397ec257719c0e1f8734d57daece76a0e..78a9155e78178f1cc8da2a2d42fd3276565030f5 100644
index 72e8e8ff651cf254e0fe3a8927272ea8da0f5f5a..74731f0d64d3bfc61baf816516b2bcef6515213e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2499,5 +2499,89 @@ public final class Bukkit {
@@ -2498,5 +2498,89 @@ public final class Bukkit {
public static void removeFuel(@NotNull Material material) {
server.removeFuel(material);
}
@@ -99,10 +99,10 @@ index 83e1360397ec257719c0e1f8734d57daece76a0e..78a9155e78178f1cc8da2a2d42fd3276
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index b2184f33f8b34ae484357742690e205accaa635f..730caafaf9629664ba125f3884559da76616f655 100644
index 8b53a9149f655870ebc1c912eeb9fecbcb4836b8..d87e4d177b60957eee198c3f1791dbf26dbdddd6 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2178,5 +2178,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2177,5 +2177,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);