diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index 40191e7..a808f0c 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 52b2476ab289177423fd0c5d4a644eaaf5292b6e Mon Sep 17 00:00:00 2001
+From 54b91cd62efdce89489199bc102a9beab569079e Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 19:33:31 +0200
 Subject: [PATCH] POM Changes
@@ -67,10 +67,10 @@ index 5d782001..4b9e171d 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index 9a11e65a..5e9b2ab3 100644
+index 9a11e65a..9cae021d 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
-@@ -4,19 +4,19 @@
+@@ -4,38 +4,39 @@
      <modelVersion>4.0.0</modelVersion>
  
      <parent>
@@ -96,7 +96,13 @@ index 9a11e65a..5e9b2ab3 100644
  
      <properties>
          <maven.deploy.skip>true</maven.deploy.skip>
-@@ -27,15 +27,15 @@
+-        <maven.compiler.source>1.6</maven.compiler.source>
+-        <maven.compiler.target>1.6</maven.compiler.target>
++        <!-- use java 1.8, literally nobody is using 1.6-7 anymore, and, if they are, that's their own stupidity. -->
++        <maven.compiler.source>1.8</maven.compiler.source>
++        <maven.compiler.target>1.8</maven.compiler.target>
+         <maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
+     </properties>
  
      <dependencies>
          <dependency>
@@ -115,7 +121,7 @@ index 9a11e65a..5e9b2ab3 100644
          <plugins>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
-@@ -44,7 +44,7 @@
+@@ -44,7 +45,7 @@
                  <configuration>
                      <archive>
                          <manifestEntries>
diff --git a/BungeeCord-Patches/0037-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch b/BungeeCord-Patches/0037-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
index 45d5964..0a8d395 100644
--- a/BungeeCord-Patches/0037-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
+++ b/BungeeCord-Patches/0037-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
@@ -1,4 +1,4 @@
-From 58d84e502354fbf7ba5085a92c1dffc0ee8db8cc Mon Sep 17 00:00:00 2001
+From f8b721b6e23bc29ad538e02d117a4ddf561fba06 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 12:46:47 +0200
 Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@@ -6,10 +6,10 @@ Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
 
 
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index 5e9b2ab3..0a27c9f6 100644
+index 9cae021d..e7b76d5b 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
-@@ -47,6 +47,9 @@
+@@ -48,6 +48,9 @@
                              <Main-Class>net.md_5.bungee.Bootstrap</Main-Class>
                              <Implementation-Version>${describe}</Implementation-Version>
                              <Specification-Version>${maven.build.timestamp}</Specification-Version>
@@ -19,7 +19,7 @@ index 5e9b2ab3..0a27c9f6 100644
                          </manifestEntries>
                      </archive>
                  </configuration>
-@@ -74,7 +77,17 @@
+@@ -75,7 +78,17 @@
                              </excludes>
                          </filter>
                      </filters>
@@ -233,7 +233,7 @@ index 00000000..93ce3b14
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index 32ef5311..b8f1d94f 100644
+index 82872150..903fd182 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -56,6 +56,7 @@
@@ -245,7 +245,7 @@ index 32ef5311..b8f1d94f 100644
          <module>protocol</module>
          <module>proxy</module>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 548b6bb9..39d6e35e 100644
+index 01cb5c50..52e45fe1 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -70,7 +70,7 @@