From 11b21a19c31742c9f0ea7573811851dfa3231c4e Mon Sep 17 00:00:00 2001
From: Automated <noreply+automated@papermc.io>
Date: Mon, 15 Mar 2021 02:57:17 -0400
Subject: [PATCH] [Auto] Updated Upstream (CraftBukkit)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
2ffdb31ec Use upstream plexus-compiler-eclipse
---
 Spigot-Server-Patches/Implement-Mob-Goal-API.patch | 2 +-
 Spigot-Server-Patches/POM-Changes.patch            | 2 +-
 work/CraftBukkit                                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Spigot-Server-Patches/Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/Implement-Mob-Goal-API.patch
index caaf42ccf5..c0db9fda5d 100644
--- a/Spigot-Server-Patches/Implement-Mob-Goal-API.patch
+++ b/Spigot-Server-Patches/Implement-Mob-Goal-API.patch
@@ -21,7 +21,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        </dependency>
      </dependencies>
  
-     <repositories>
+     <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
diff --git a/Spigot-Server-Patches/POM-Changes.patch b/Spigot-Server-Patches/POM-Changes.patch
index 282dc7fd4d..a9f227f4ed 100644
--- a/Spigot-Server-Patches/POM-Changes.patch
+++ b/Spigot-Server-Patches/POM-Changes.patch
@@ -195,8 +195,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                    <compilerId>eclipse</compilerId>
 -                </configuration>
                  <dependencies>
-                     <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
                      <dependency>
+                         <groupId>org.codehaus.plexus</groupId>
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
diff --git a/work/CraftBukkit b/work/CraftBukkit
index ee5006d187..2ffdb31ec0 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit ee5006d1873170ce1ad908455f680b228096da87
+Subproject commit 2ffdb31ec0d6827d7cd5e832b5393514f46c0c19