mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream B/CB/S

Browse source
This commit is contained in:
Zach Brown 2018-01-04 02:04:31 -06:00
parent ab5109009c
commit fc911a20f5
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
View file

@ -1,4 +1,4 @@
From 9465160fd187615d638bf31423d3ad78ab1e30ca Mon Sep 17 00:00:00 2001
From 26b7c3d6ac64b033578ae2d9a5bf30af408f1418 Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Thu, 21 Sep 2017 19:41:20 +0200
Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin
@ -77,7 +77,7 @@ index 0abad9ad..14dda205 100644
/**
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index 2a1974ec..c9805bb9 100644
index ca9c7796..a7d87d2d 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -36,6 +36,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@ -97,7 +97,7 @@ index 2a1974ec..c9805bb9 100644
try {
Class<?> jarClass;
try {
@@ -181,6 +184,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -187,6 +190,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
pluginState = new IllegalStateException("Initial initialization");
this.pluginInit = javaPlugin;
@ -106,5 +106,5 @@ index 2a1974ec..c9805bb9 100644
}
}
--
2.15.1
2.15.1.windows.2