From 4c58568eb411cc4a83bc772148f7f5956de68d9b Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+DoctorMacc@users.noreply.github.com>
Date: Wed, 2 Sep 2020 23:42:53 -0400
Subject: [PATCH] Relocate Google Common (#1242)

Fixes NoSuchMethodErrors from occuring on certain Spigot servers.
---
 bootstrap/bungeecord/pom.xml | 6 +++++-
 bootstrap/spigot/pom.xml     | 6 +++++-
 bootstrap/sponge/pom.xml     | 6 +++++-
 bootstrap/velocity/pom.xml   | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
index 3fb7090f..44b28e93 100644
--- a/bootstrap/bungeecord/pom.xml
+++ b/bootstrap/bungeecord/pom.xml
@@ -73,9 +73,13 @@
                                     <pattern>org.reflections</pattern>
                                     <shadedPattern>org.geysermc.platform.bungeecord.shaded.reflections</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.google.common</pattern>
+                                    <shadedPattern>org.geysermc.platform.bungeecord.shaded.google.common</shadedPattern>
+                                </relocation>
                                 <relocation>
                                     <pattern>com.google.guava</pattern>
-                                    <shadedPattern>org.geysermc.platform.bungeecord.shaded.guava</shadedPattern>
+                                    <shadedPattern>org.geysermc.platform.bungeecord.shaded.google.guava</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.dom4j</pattern>
diff --git a/bootstrap/spigot/pom.xml b/bootstrap/spigot/pom.xml
index 79bdfea0..194ec6e5 100644
--- a/bootstrap/spigot/pom.xml
+++ b/bootstrap/spigot/pom.xml
@@ -79,9 +79,13 @@
                                     <pattern>org.reflections</pattern>
                                     <shadedPattern>org.geysermc.platform.spigot.shaded.reflections</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.google.common</pattern>
+                                    <shadedPattern>org.geysermc.platform.spigot.shaded.google.common</shadedPattern>
+                                </relocation>
                                 <relocation>
                                     <pattern>com.google.guava</pattern>
-                                    <shadedPattern>org.geysermc.platform.spigot.shaded.guava</shadedPattern>
+                                    <shadedPattern>org.geysermc.platform.spigot.shaded.google.guava</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.dom4j</pattern>
diff --git a/bootstrap/sponge/pom.xml b/bootstrap/sponge/pom.xml
index 3c20239f..132f3817 100644
--- a/bootstrap/sponge/pom.xml
+++ b/bootstrap/sponge/pom.xml
@@ -73,9 +73,13 @@
                                     <pattern>org.reflections</pattern>
                                     <shadedPattern>org.geysermc.platform.sponge.shaded.reflections</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.google.common</pattern>
+                                    <shadedPattern>org.geysermc.platform.sponge.shaded.google.common</shadedPattern>
+                                </relocation>
                                 <relocation>
                                     <pattern>com.google.guava</pattern>
-                                    <shadedPattern>org.geysermc.platform.sponge.shaded.guava</shadedPattern>
+                                    <shadedPattern>org.geysermc.platform.sponge.shaded.google.guava</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.dom4j</pattern>
diff --git a/bootstrap/velocity/pom.xml b/bootstrap/velocity/pom.xml
index efe6c80a..ee445b6e 100644
--- a/bootstrap/velocity/pom.xml
+++ b/bootstrap/velocity/pom.xml
@@ -69,9 +69,13 @@
                                     <pattern>org.reflections</pattern>
                                     <shadedPattern>org.geysermc.platform.velocity.shaded.reflections</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.google.common</pattern>
+                                    <shadedPattern>org.geysermc.platform.velocity.shaded.google.common</shadedPattern>
+                                </relocation>
                                 <relocation>
                                     <pattern>com.google.guava</pattern>
-                                    <shadedPattern>org.geysermc.platform.velocity.shaded.guava</shadedPattern>
+                                    <shadedPattern>org.geysermc.platform.velocity.shaded.google.guava</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.dom4j</pattern>