From 61ccf4bd87e9d1a9f6a04cb4021c50cc5996fa7d Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Wed, 17 Mar 2021 10:20:38 +0100 Subject: [PATCH] rebase --- Spigot-Server-Patches/Adventure.patch | 2 -- scripts/decompile.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/Adventure.patch b/Spigot-Server-Patches/Adventure.patch index 309548fd0d..d389f38734 100644 --- a/Spigot-Server-Patches/Adventure.patch +++ b/Spigot-Server-Patches/Adventure.patch @@ -321,8 +321,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + + 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..0000000000000000000000000000000000000000 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."