Skip to content

Commit

Permalink
Update B
Browse files Browse the repository at this point in the history
  • Loading branch information
electronicboy committed Dec 28, 2017
1 parent eb0f5ad commit 1180d8f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
@@ -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>
Date: Thu, 21 Sep 2017 19:41:20 +0200
Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin
Expand Down Expand Up @@ -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 a657fce5..67b53d4e 100644
index 2a1974ec..c9805bb9 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
Expand All @@ -97,7 +97,7 @@ index a657fce5..67b53d4e 100644
try {
Class<?> jarClass;
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");
this.pluginInit = javaPlugin;

Expand All @@ -106,5 +106,5 @@ index a657fce5..67b53d4e 100644
}
}
--
2.15.1.windows.2
2.15.1

2 changes: 1 addition & 1 deletion work/Bukkit
Submodule Bukkit updated from c29791 to 209716

0 comments on commit 1180d8f

Please sign in to comment.