Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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@6520ca1 Fix main thread priority being lowered (#9488)
PaperMC/Paper@47b805f Don't let player loot if reloot time is disabled (#9615)
PaperMC/Paper@73af2d4 Add clicked position to PlayerUseUnknownEntityEvent (#9604)
PaperMC/Paper@ea1f33c Delete patch to fix PaperMC/Paper#9612 (#9621)
PaperMC/Paper@307d05b Count down radius-aware dependency tree node parents (#9600)
PaperMC/Paper@eb8f2bb Fix unknown entity interaction clicked position getter if null
PaperMC/Paper@fd4f0c7 API for an entity's scoreboard name (#9462)
PaperMC/Paper@2bd6ba2 Deprecate and replace methods using deprecated StructureType (#8643)
PaperMC/Paper@666a214 [ci skip] rebuild patches
This commit is contained in:
granny
2023-08-20 19:11:32 -07:00
parent aeecb71060
commit c5c7609d0b
18 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0003-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 68206cf0178c26c0f528a1e14a5fb4e9ad410369..7e3c17cebaa4f648290eac87940a425826fe72d2 100644
index 8d8fe04e6b09d2a5b1cc05002073df5c58cdcb96..c71576fea7e0e7c3ad54912ed61d1ff20aaea4c2 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2081,6 +2081,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2121,6 +2121,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Paper end

8
patches/api/0007-Ridables.patch
View File

@@ -22,13 +22,13 @@ index b7a2cecb334ce39fa09d8ab949a29eedbdc44c36..6f55ccfff74b361854bf424fd93f0428
* @deprecated removed in 1.16
*/
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 6b842453589cf148ab32c1507cf374056826316e..84000002d89c0fb692d1c44f449ad3dcdd2b7576 100644
index 75664470303a6e0cbd393c0db32b78b3af818cb6..f4a614f1a1df3a6a6a9edefec9ac81b14476727e 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -965,4 +965,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -976,4 +976,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@NotNull io.papermc.paper.threadedregions.scheduler.EntityScheduler getScheduler();
// Paper end - Folia schedulers
@NotNull String getScoreboardEntryName();
// Paper end - entity scoreboard name
+
+ // Purpur start
+ /**

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 f380a518bc444bfdfbbedf38805c7684e53a5629..d3e3f1781ac04e0d3a24476de856ba72f25c02f1 100644
index f78b5fd3c3347d28da58777bff88903d2eb140f6..7338dad470cd75814cce5be40f82058554484607 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2714,4 +2714,15 @@ public final class Bukkit {
@@ -2756,4 +2756,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index f380a518bc444bfdfbbedf38805c7684e53a5629..d3e3f1781ac04e0d3a24476de856ba72
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 7e3c17cebaa4f648290eac87940a425826fe72d2..33778dcc7c723ce210b5f5c6e03fd3678dcc11b0 100644
index c71576fea7e0e7c3ad54912ed61d1ff20aaea4c2..fc2ff6fce4d7b4466cb7936b530c1c0d17f9f24f 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2376,4 +2376,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2416,4 +2416,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API

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 d3e3f1781ac04e0d3a24476de856ba72f25c02f1..728822f51d615bd2f4cb3cc1f2097309cac15fef 100644
index 7338dad470cd75814cce5be40f82058554484607..a32155e0cc63d4e4714a953edbae0b19544ff3ef 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2724,5 +2724,14 @@ public final class Bukkit {
@@ -2766,5 +2766,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index d3e3f1781ac04e0d3a24476de856ba72f25c02f1..728822f51d615bd2f4cb3cc1f2097309
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 33778dcc7c723ce210b5f5c6e03fd3678dcc11b0..1a1aebe2a398fa433179220e16058c1fb513de94 100644
index fc2ff6fce4d7b4466cb7936b530c1c0d17f9f24f..5b8ce8a5658021c6fdfeabca6c7bb31ebc58e71d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2384,5 +2384,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2424,5 +2424,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();

4
patches/api/0031-API-for-any-mob-to-burn-daylight.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 84000002d89c0fb692d1c44f449ad3dcdd2b7576..964ec7bd70fcdfcffd51b310cdea84c7c5db6c95 100644
index f4a614f1a1df3a6a6a9edefec9ac81b14476727e..af32ed4d9378b2394a66b21e3de67f1b7a4c2427 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -995,5 +995,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1006,5 +1006,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return True if ridable in water
*/
boolean isRidableInWater();

8
patches/api/0037-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 728822f51d615bd2f4cb3cc1f2097309cac15fef..285c0b7a477991d43eaee088a522bb9fb5cac6aa 100644
index a32155e0cc63d4e4714a953edbae0b19544ff3ef..222dcb75a850d224ac22b2e06895233527cffc76 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2733,5 +2733,24 @@ public final class Bukkit {
@@ -2775,5 +2775,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index 728822f51d615bd2f4cb3cc1f2097309cac15fef..285c0b7a477991d43eaee088a522bb9f
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 1a1aebe2a398fa433179220e16058c1fb513de94..8e41a73b1b8add77fc7bf79b261554b528ec48d0 100644
index 5b8ce8a5658021c6fdfeabca6c7bb31ebc58e71d..3bc9fa8b68b284516ddbf0ace0c1dc52768307cb 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2391,5 +2391,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2431,5 +2431,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();

8
patches/api/0045-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 285c0b7a477991d43eaee088a522bb9fb5cac6aa..b72708be4c431c4a8b8905d1872fdba4cefc10ae 100644
index 222dcb75a850d224ac22b2e06895233527cffc76..584e3b08935f43beb27f478cc72229b6a5f40689 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2752,5 +2752,89 @@ public final class Bukkit {
@@ -2794,5 +2794,89 @@ public final class Bukkit {
public static void removeFuel(@NotNull Material material) {
server.removeFuel(material);
}
@@ -99,10 +99,10 @@ index 285c0b7a477991d43eaee088a522bb9fb5cac6aa..b72708be4c431c4a8b8905d1872fdba4
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 8e41a73b1b8add77fc7bf79b261554b528ec48d0..615c47f069d429e14993c60253f719b514849a67 100644
index 3bc9fa8b68b284516ddbf0ace0c1dc52768307cb..aaef58468a3c31f35e5067ed4263e9dd3fbddddd 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2406,5 +2406,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2446,5 +2446,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);

4
patches/api/0050-Fire-Immunity-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fire Immunity API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 964ec7bd70fcdfcffd51b310cdea84c7c5db6c95..af421c1e9ad155e190dc3fe67ed24e96857d9e33 100644
index af32ed4d9378b2394a66b21e3de67f1b7a4c2427..a9c629701fdb253c223f2d94ae7010eb35770fe8 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1002,5 +1002,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1013,5 +1013,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return True if in daylight
*/
boolean isInDaylight();