From 1cda671187ceae81a70ec650c011ddd86e445ef4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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/0001-POM-Changes.patch     | 16 ++++++++--------
 ...onsoleAppender-for-console-improvements.patch |  4 ++--
 .../0466-Implement-Mob-Goal-API.patch            |  6 +++---
 work/CraftBukkit                                 |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index 1b317c19e..cf5cf2cc3 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index a9d4c697fd52614cff7f035b5e9c7c52c925065b..301bee0db7b1118b2a6588c7ecfa9a6be5e1cd93 100644
+index 8b6cb74b255017dced20347c9fd97bbf4d834f9e..b89112912a5b70fb0d77645e4b140f3ee6e6c55a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,15 +1,14 @@
@@ -79,7 +79,7 @@ index a9d4c697fd52614cff7f035b5e9c7c52c925065b..301bee0db7b1118b2a6588c7ecfa9a6b
          <!-- deprecated API depend -->
          <dependency>
              <groupId>com.googlecode.json-simple</groupId>
-@@ -120,34 +136,22 @@
+@@ -100,34 +116,22 @@
  
      <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
      <build>
@@ -125,7 +125,7 @@ index a9d4c697fd52614cff7f035b5e9c7c52c925065b..301bee0db7b1118b2a6588c7ecfa9a6b
                          </goals>
                      </execution>
                  </executions>
-@@ -157,6 +161,7 @@
+@@ -137,6 +141,7 @@
                  <artifactId>maven-jar-plugin</artifactId>
                  <version>3.2.0</version>
                  <configuration>
@@ -133,7 +133,7 @@ index a9d4c697fd52614cff7f035b5e9c7c52c925065b..301bee0db7b1118b2a6588c7ecfa9a6b
                      <archive>
                          <manifest>
                              <addDefaultEntries>false</addDefaultEntries>
-@@ -164,8 +169,9 @@
+@@ -144,8 +149,9 @@
                          <manifestEntries>
                              <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
                              <Implementation-Title>CraftBukkit</Implementation-Title>
@@ -145,7 +145,7 @@ index a9d4c697fd52614cff7f035b5e9c7c52c925065b..301bee0db7b1118b2a6588c7ecfa9a6b
                              <Specification-Title>Bukkit</Specification-Title>
                              <Specification-Version>${api.version}</Specification-Version>
                              <Specification-Vendor>Bukkit Team</Specification-Vendor>
-@@ -204,14 +210,23 @@
+@@ -184,14 +190,23 @@
                              <goal>shade</goal>
                          </goals>
                          <configuration>
@@ -170,7 +170,7 @@ index a9d4c697fd52614cff7f035b5e9c7c52c925065b..301bee0db7b1118b2a6588c7ecfa9a6b
                                      </excludes>
                                  </filter>
                              </filters>
-@@ -227,10 +242,11 @@
+@@ -207,10 +222,11 @@
                                      <pattern>jline</pattern>
                                      <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
                                  </relocation>
@@ -186,7 +186,7 @@ index a9d4c697fd52614cff7f035b5e9c7c52c925065b..301bee0db7b1118b2a6588c7ecfa9a6b
                                  <relocation>
                                      <pattern>org.apache.commons.codec</pattern>
                                      <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.codec</shadedPattern>
-@@ -272,10 +288,6 @@
+@@ -252,10 +268,6 @@
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-compiler-plugin</artifactId>
                  <version>3.8.1</version>
@@ -195,8 +195,8 @@ index a9d4c697fd52614cff7f035b5e9c7c52c925065b..301bee0db7b1118b2a6588c7ecfa9a6b
 -                    <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 60ede7442b2d9a63fcd765aff29a96c9130aebac..3f52c19b6b797e26b3dcedcec2afd28c478e7091 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
diff --git a/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch
index 4829e50af..6fd17a594 100644
--- a/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index 301bee0db7b1118b2a6588c7ecfa9a6be5e1cd93..0a6e1782c0eb8aa3aff94c5bfae5c5ea4a24ba56 100644
+index b89112912a5b70fb0d77645e4b140f3ee6e6c55a..9888ac56e4fd14f17c032b44d1de5809e598a1a5 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -45,10 +45,27 @@
@@ -54,7 +54,7 @@ index 301bee0db7b1118b2a6588c7ecfa9a6be5e1cd93..0a6e1782c0eb8aa3aff94c5bfae5c5ea
          </dependency>
          <dependency>
              <groupId>org.apache.logging.log4j</groupId>
-@@ -279,10 +296,18 @@
+@@ -259,10 +276,18 @@
                                  <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                      <resource>META-INF/services/java.sql.Driver</resource>
                                  </transformer>
diff --git a/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
index 55435f07e..5fb5832e1 100644
--- a/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
+++ b/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/pom.xml b/pom.xml
-index ba6e70eb472bda9d0cf51c3b69a5bd41fc24c399..9ba379b7e3ee3bc8c6d2c8ec46213c404c73d682 100644
+index 324e51d262ec4dc3224da3e21209c53c37a13644..11b4d56922cae5ba3f76c21a76a8ae40b3719afa 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -142,6 +142,13 @@
@@ -21,7 +21,7 @@ index ba6e70eb472bda9d0cf51c3b69a5bd41fc24c399..9ba379b7e3ee3bc8c6d2c8ec46213c40
 +        </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..89b56de7567ae54be75e0735b712e4dd713f1bf4
@@ -873,7 +873,7 @@ index 22773eca7561d39cd838338efe6d40ab9421feba..2e56fcc32f914d2b5f4bb9d368f504f4
  
      public PathfinderGoalWrapped(int i, PathfinderGoal pathfindergoal) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d0091fb05a0122e099d4d496f3e04a91b778cff2..e466dd5077fbae6963783774cb7a32b0bbca41ac 100644
+index f0b348264455655d203e67f008b67ed7de089047..6728a0f753a457fea485265739ca85ebebbf40bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2385,5 +2385,11 @@ public final class CraftServer implements Server {
diff --git a/work/CraftBukkit b/work/CraftBukkit
index ee5006d18..2ffdb31ec 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit ee5006d1873170ce1ad908455f680b228096da87
+Subproject commit 2ffdb31ec0d6827d7cd5e832b5393514f46c0c19