From 1180d8f3832972fb79942fcbe584c96a1e9140de Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 28 Dec 2017 16:56:31 +0000
Subject: [PATCH] Update B

---
 ...workaround-for-plugins-modifying-the-parent-of-t.patch | 8 ++++----
 work/Bukkit                                               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
index 31863b72a8..aff5c583e3 100644
--- a/Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
+++ b/Spigot-API-Patches/0069-Add-workaround-for-plugins-modifying-the-parent-of-t.patch
@@ -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
@@ -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
@@ -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;
  
@@ -106,5 +106,5 @@ index a657fce5..67b53d4e 100644
      }
  }
 -- 
-2.15.1.windows.2
+2.15.1
 
diff --git a/work/Bukkit b/work/Bukkit
index c29791a82d..20971610da 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit c29791a82d9350af40164b501f6ca26d00e2ccba
+Subproject commit 20971610daa5cbe1685ac9ba0fa93525e7158048