From 6f5fc4c85ca56c66228abe265b847194fbae2057 Mon Sep 17 00:00:00 2001
From: RednedEpic <redned235@gmail.com>
Date: Wed, 4 Dec 2019 18:56:14 -0600
Subject: [PATCH] Fix JNI overlap with BungeeCord module

---
 bootstrap/bungeecord/pom.xml          | 6 ++++++
 connector/src/main/resources/mappings | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
index 5d437bbf..e30e8767 100644
--- a/bootstrap/bungeecord/pom.xml
+++ b/bootstrap/bungeecord/pom.xml
@@ -48,6 +48,12 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>net.md_5.bungee.jni</pattern>
+                            <shadedPattern>org.geysermc.platform.bungeecord.shaded.jni</shadedPattern>
+                        </relocation>
+                    </relocations>
                     <minimizeJar>true</minimizeJar>
                 </configuration>
             </plugin>
diff --git a/connector/src/main/resources/mappings b/connector/src/main/resources/mappings
index 5ec6f1f3..3d4147f0 160000
--- a/connector/src/main/resources/mappings
+++ b/connector/src/main/resources/mappings
@@ -1 +1 @@
-Subproject commit 5ec6f1f339506129514de59d0e09e9b2c612e8be
+Subproject commit 3d4147f001266d01eae6b8479428ca77bb5bf0c3