Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17: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:
4276013833 Updated Upstream (Bukkit/CraftBukkit/Spigot)
5344798579 Clean plugin folder logic in extra-jars patch (Fixes #6347) (#6619)
3f2159e43c Unlimited chunk load rate (#6768)
fc0e6c7e08 Fix off by one for determining server view distance
0a16fb8182 Fix merchant inventories not closing on entity removal (#6544)
c1644521c9 Do not overload I/O threads with chunk data while flush saving
This commit is contained in:
William Blake Galbreath
2021-10-16 12:56:31 -05:00
parent e876536ae9
commit db65efba2b
13 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0001-Airplane-API-Changes.patch
View File

@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index 1ab107d5bb20b9a12fc8843513bd9a3ada50c0a3..70aa79c0bfde6aea8031eeb69124344ab3af5c27 100644
index 8a39c48fce819d72a94d5309db8dfc42930989af..4c84e3a5c983b7f8fe5515fff6fcfa64106150d2 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -46,6 +46,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -31,7 +31,7 @@ index 1ab107d5bb20b9a12fc8843513bd9a3ada50c0a3..70aa79c0bfde6aea8031eeb69124344a
static {
ClassLoader.registerAsParallelCapable();
}
@@ -146,6 +148,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -151,6 +153,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
throw new ClassNotFoundException(name);
}
@@ -39,7 +39,7 @@ index 1ab107d5bb20b9a12fc8843513bd9a3ada50c0a3..70aa79c0bfde6aea8031eeb69124344a
@Override
protected Class<?> findClass(String name) throws ClassNotFoundException {
if (name.startsWith("org.bukkit.") || name.startsWith("net.minecraft.")) {
@@ -153,7 +156,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -158,7 +161,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
}
Class<?> result = classes.get(name);
@@ -48,7 +48,7 @@ index 1ab107d5bb20b9a12fc8843513bd9a3ada50c0a3..70aa79c0bfde6aea8031eeb69124344a
String path = name.replace('.', '/').concat(".class");
JarEntry entry = jar.getJarEntry(path);
@@ -208,6 +211,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -213,6 +216,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
try {
super.close();
} finally {

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 a4fd6f6e51c478efa9b125d3878c246b5f762999..16b37de6e0c585570499949f931ba14c801bd421 100644
index c551010f84ac5d3ebc626c253a8f8282924152c4..a2a97c3ce3c7e7baf67f7f70d9ac2d3dc048075a 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2104,4 +2104,15 @@ public final class Bukkit {
@@ -2118,4 +2118,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index a4fd6f6e51c478efa9b125d3878c246b5f762999..16b37de6e0c585570499949f931ba14c
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 0cba13a8a0bc1ebe5f8365072c4d3234f2261056..a031e0003d712f123da3b112dce4fc1e98a5bc68 100644
index 1d1fe3b7341629695de62ff3110b5563f6daee39..6daf552c9c528a8bacab7db7a61254312d8e1db6 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1837,4 +1837,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1849,4 +1849,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
io.papermc.paper.datapack.DatapackManager getDatapackManager();
// 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 16b37de6e0c585570499949f931ba14c801bd421..fa3b34c9e79e57d9385c9160ac654cd5d5f54dc7 100644
index a2a97c3ce3c7e7baf67f7f70d9ac2d3dc048075a..af9fa63eca06a80f19578a2590a3280948b297ae 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2114,5 +2114,14 @@ public final class Bukkit {
@@ -2128,5 +2128,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 16b37de6e0c585570499949f931ba14c801bd421..fa3b34c9e79e57d9385c9160ac654cd5
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index a031e0003d712f123da3b112dce4fc1e98a5bc68..f1b351610185332e9c1e32d4cb7182783d33cc0b 100644
index 6daf552c9c528a8bacab7db7a61254312d8e1db6..c6b478fe41dcd6017571c68f3114442f3c9f6415 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1845,5 +1845,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1857,5 +1857,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();

8
patches/api/0049-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 f4e35cd1a398cc07842c359ec560eed4596732b4..6197605519abf3c59108f1dff34105cc2bca10c2 100644
index 5d20d91f44a9f0f94183eaea300d1033f292a28e..2e86aa13913553306512232a72497ec6b003260c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2123,5 +2123,24 @@ public final class Bukkit {
@@ -2137,5 +2137,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index f4e35cd1a398cc07842c359ec560eed4596732b4..6197605519abf3c59108f1dff34105cc
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index e89d80128b2944efb7e105b92f8f825afe80affb..c44212baa2cc167a1a818c158441e5ff749f29eb 100644
index 4d15d4b5b23d38599ab227dc1c2a9c25a077e531..ccfb8a8dcd51bf998c79298a22e38cebb2be6d39 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1855,5 +1855,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1867,5 +1867,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();