From 700e9e6a562345eec95dd08b30294669c9867d4e Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <proximyst@proximyst.com>
Date: Wed, 17 Mar 2021 10:20:38 +0100
Subject: [PATCH] rebase

---
 Spigot-Server-Patches/0010-Adventure.patch                    | 4 +---
 ...Option-to-use-vanilla-per-world-scoreboard-coloring-.patch | 4 ++--
 scripts/decompile.sh                                          | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Spigot-Server-Patches/0010-Adventure.patch b/Spigot-Server-Patches/0010-Adventure.patch
index 78af38078b..ea38b4d99f 100644
--- a/Spigot-Server-Patches/0010-Adventure.patch
+++ b/Spigot-Server-Patches/0010-Adventure.patch
@@ -106,7 +106,7 @@ index 0000000000000000000000000000000000000000..dd018bb835e1b9fb2496404e1e5b1038
 +}
 diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..aa509a1f382991e0f5683b75b0af4094f84d2844
+index 0000000000000000000000000000000000000000..ee377d5bd8646733968f4085f60150f8ff6a4a5c
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
 @@ -0,0 +1,211 @@
@@ -321,8 +321,6 @@ index 0000000000000000000000000000000000000000..aa509a1f382991e0f5683b75b0af4094
 +
 +    private static boolean anyListeners(final HandlerList handlers) {
 +        return handlers.getRegisteredListeners().length > 0;
-+    }
-+}
 diff --git a/src/main/java/io/papermc/paper/adventure/DisplayNames.java b/src/main/java/io/papermc/paper/adventure/DisplayNames.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..b1d9d6276eb577ed3c66df1f89b3266d2c48eaf2
diff --git a/Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index e520454f69..d2234cc775 100644
--- a/Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -26,7 +26,7 @@ index db2dddd12f54e6d15916c4cee623676541de37fb..1942f5224aaebb18adb591d6f70a419c
 +    }
  }
 diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
-index d92a454adc9773883563eb0efff9c6445b89c0d4..712ca6b3857c6e5cae25a71228365508e514a0f4 100644
+index ee377d5bd8646733968f4085f60150f8ff6a4a5c..f68b8c921cc07764ce78547b78689e8b5b68320c 100644
 --- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
 +++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java
 @@ -16,7 +16,11 @@ import net.kyori.adventure.text.format.TextDecoration;
@@ -41,7 +41,7 @@ index d92a454adc9773883563eb0efff9c6445b89c0d4..712ca6b3857c6e5cae25a71228365508
  import org.bukkit.craftbukkit.entity.CraftPlayer;
  import org.bukkit.craftbukkit.util.LazyPlayerSet;
  import org.bukkit.craftbukkit.util.Waitable;
-@@ -104,10 +108,22 @@ public final class ChatProcessor {
+@@ -177,10 +181,22 @@ public final class ChatProcessor {
      }
  
      private static String legacyDisplayName(final CraftPlayer player) {
diff --git a/scripts/decompile.sh b/scripts/decompile.sh
index d90a6de9da..0d0467d99a 100755
--- a/scripts/decompile.sh
+++ b/scripts/decompile.sh
@@ -73,7 +73,7 @@ if [ ! -d "$classdir" ]; then
     mkdir -p "$classdir"
     cd "$classdir"
     set +e
-    jar xf "$decompiledir/$minecraftversion-mapped.jar" net/minecraft
+    jar xf "$decompiledir/$minecraftversion-mapped.jar" net/minecraft com/mojang/math
     if [ "$?" != "0" ]; then
         cd "$basedir"
         echo "Failed to extract NMS classes."