Fix NoClassDefFoundError on < 1.12 with Discord execute command (Esse…

…ntialsX#4478)
GenSecrets · Aug 26, 2021 · 69850d8 · 69850d8
1 parent df88a89
commit 69850d8
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 23 deletions.
diff --git a/providers/BaseProviders/src/main/java/net/ess3/provider/providers/BukkitSenderProvider.java b/providers/BaseProviders/src/main/java/net/ess3/provider/providers/BukkitSenderProvider.java
@@ -1,7 +1,5 @@
 package net.ess3.provider.providers;
 
-import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
@@ -60,27 +58,13 @@ public String getName() {
 
     @Override
     public Spigot spigot() {
-        return new Spigot() {
-            @Override
-            public void sendMessage(BaseComponent component) {
-                BukkitSenderProvider.this.sendMessage(component.toLegacyText());
-            }
-
-            @Override
-            public void sendMessage(BaseComponent... components) {
-                sendMessage(new TextComponent(components));
-            }
-
-            @Override
-            public void sendMessage(UUID sender, BaseComponent... components) {
-                sendMessage(components);
-            }
-
-            @Override
-            public void sendMessage(UUID sender, BaseComponent component) {
-                sendMessage(component);
-            }
-        };
+        try {
+            Class.forName("org.bukkit.command.CommandSender$Spigot");
+            return ModernCommandSenderSpigotCreator.stupidDumbHackToMakeTheJvmHappy(this);
+        } catch (ClassNotFoundException ignored) {
+            //noinspection ConstantConditions
+            return null;
+        }
     }
 
     @Override

diff --git a/...Providers/src/main/java/net/ess3/provider/providers/ModernCommandSenderSpigotCreator.java b/...Providers/src/main/java/net/ess3/provider/providers/ModernCommandSenderSpigotCreator.java
@@ -0,0 +1,40 @@
+package net.ess3.provider.providers;
+
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.command.CommandSender;
+
+import java.util.UUID;
+
+public final class ModernCommandSenderSpigotCreator {
+    private ModernCommandSenderSpigotCreator() {
+    }
+
+    /**
+     * The JVM will FOR SOME REASON try to load inner classes even BEFORE THE CODE WHICH REFERENCE THEM IS CALLED.
+     * This dumbass hack postpones the class lookup to until we know for sure the class exists.
+     */
+    public static CommandSender.Spigot stupidDumbHackToMakeTheJvmHappy(BukkitSenderProvider provider) {
+        return new CommandSender.Spigot() {
+            @Override
+            public void sendMessage(BaseComponent component) {
+                provider.sendMessage(component.toLegacyText());
+            }
+
+            @Override
+            public void sendMessage(BaseComponent... components) {
+                sendMessage(new TextComponent(components));
+            }
+
+            @Override
+            public void sendMessage(UUID sender, BaseComponent... components) {
+                sendMessage(components);
+            }
+
+            @Override
+            public void sendMessage(UUID sender, BaseComponent component) {
+                sendMessage(component);
+            }
+        };
+    }
+}