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:
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 {