From 9b0080a3ced33d7328837f6f564483ce8208d8e7 Mon Sep 17 00:00:00 2001
From: Noah van der Aa <ndvdaa@gmail.com>
Date: Tue, 7 Jun 2022 19:44:58 +0200
Subject: [PATCH] Fix crash on startup (#743)

---
 .../0002-Copy-license-files-into-jar.patch               | 9 ++++++---
 ...og4j2-for-logging-and-TerminalConsoleAppender-f.patch | 4 +---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch b/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch
index e9a0be8..874206f 100644
--- a/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch
+++ b/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch
@@ -1,14 +1,14 @@
-From 642384e902e7533cb16d113de3ae970be011532f Mon Sep 17 00:00:00 2001
+From 9023de96647d320da12a0d65285f26e18ef4385b Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 18 Jul 2018 20:23:03 +0300
 Subject: [PATCH] Copy license files into jar
 
 
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index a86eb68c..82366109 100644
+index a86eb68c..0202f4f0 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
-@@ -117,4 +117,23 @@
+@@ -117,4 +117,26 @@
              <scope>runtime</scope>
          </dependency>
      </dependencies>
@@ -17,6 +17,9 @@ index a86eb68c..82366109 100644
 +    <build>
 +        <resources>
 +            <resource>
++                <directory>src/main/resources</directory>
++            </resource>
++            <resource>
 +                <directory>../</directory>
 +                <includes>
 +                    <include>LICENSE</include>
diff --git a/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch b/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
index 328f9f6..b5bd1c7 100644
--- a/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
+++ b/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
@@ -209,7 +209,7 @@ new file mode 100644
 index 00000000..e32dd7b5
 --- /dev/null
 +++ b/log4j/src/main/resources/log4j2.xml
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,22 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<Configuration status="warn" shutdownHook="disable">
 +    <Appenders>
@@ -232,8 +232,6 @@ index 00000000..e32dd7b5
 +        </Root>
 +    </Loggers>
 +</Configuration>
-+io/github/waterfallmc/waterfall/log4j/WaterfallLogger.class
-+io/github/waterfallmc/waterfall/log4j/Log4JLogHandler.class
 diff --git a/pom.xml b/pom.xml
 index fad424b6..2b544c23 100644
 --- a/pom.xml