OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 07:48:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update B

Browse source
This commit is contained in:
Shane Freeder 2017-12-28 16:56:31 +00:00
parent eb0f5adfdc
commit 1180d8f383
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
2 changed files with 5 additions and 5 deletions
Show stats 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 e7a4374c01a9df9539436e80ac3b8eba4eebdc92 Mon Sep 17 00:00:00 2001 From 9465160fd187615d638bf31423d3ad78ab1e30ca Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net> From: Minecrell <dev@minecrell.net>
Date: Thu, 21 Sep 2017 19:41:20 +0200 Date: Thu, 21 Sep 2017 19:41:20 +0200
Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin 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 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index a657fce5..67b53d4e 100644 index 2a1974ec..c9805bb9 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/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 @@ -36,6 +36,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@ -97,7 +97,7 @@ index a657fce5..67b53d4e 100644
try { try {
Class<?> jarClass; Class<?> jarClass;
try { try {
@@ -177,6 +180,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot @@ -181,6 +184,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
pluginState = new IllegalStateException("Initial initialization"); pluginState = new IllegalStateException("Initial initialization");
this.pluginInit = javaPlugin; this.pluginInit = javaPlugin;
@ -106,5 +106,5 @@ index a657fce5..67b53d4e 100644
} }
} }
-- --
2.15.1.windows.2 2.15.1

2
work/Bukkit

@ -1 +1 @@
Subproject commit c29791a82d9350af40164b501f6ca26d00e2ccba Subproject commit 20971610daa5cbe1685ac9ba0fa93525e7158048