Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-03 15:08:18 +01:00
Code Issues Projects Releases Wiki Activity

Fix NoClassDefFoundError on < 1.12 with Discord execute command (#4478)

Browse Source
This commit is contained in:
Josh Roy 2021-08-26 13:12:52 -07:00 committed by GitHub
parent df88a89c14
commit 69850d82c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
providers/BaseProviders/src/main/java/net/ess3/provider/providers/BukkitSenderProvider.java
View File

@ -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 class BukkitSenderProvider implements CommandSender {
@Override
public Spigot spigot() {
return new Spigot() {
@Override
public void sendMessage(BaseComponent component) {
BukkitSenderProvider.this.sendMessage(component.toLegacyText());
try {
Class.forName("org.bukkit.command.CommandSender$Spigot");
return ModernCommandSenderSpigotCreator.stupidDumbHackToMakeTheJvmHappy(this);
} catch (ClassNotFoundException ignored) {
//noinspection ConstantConditions
return null;
}
@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);
}
};
}
@Override

40
providers/BaseProviders/src/main/java/net/ess3/provider/providers/ModernCommandSenderSpigotCreator.java Normal file
View File

@ -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);
}
};
}
}