feedc0de/FastLogin
1
0
Fork 0
forked from TuxCoding/FastLogin
Code Pull Requests Activity

Revert "Add support for checking velocity support with newer paper configs"

Browse Source 
This reverts commit 6f9e8a49f1.

Fixes #825
This commit is contained in:
games647
2022-06-28 18:11:26 +02:00
parent 9ba6e9ba90
commit e781eb6c68
1 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BungeeManager.java
View File

@ -33,7 +33,6 @@ import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Collections; import java.util.Collections;
@ -103,37 +102,18 @@ public class BungeeManager {
private boolean isProxySupported(String className, String fieldName) { private boolean isProxySupported(String className, String fieldName) {
try { try {
return Class.forName(className).getDeclaredField(fieldName).getBoolean(null); return Class.forName(className).getDeclaredField(fieldName).getBoolean(null);
} catch (ClassNotFoundException | NoSuchFieldException notFoundEx) { } catch (ClassNotFoundException notFoundEx) {
//ignore server has no proxy support //ignore server has no proxy support
} catch (IllegalAccessException noSuchFieldException) { } catch (NoSuchFieldException | IllegalAccessException noSuchFieldException) {
plugin.getLog().warn("Cannot access proxy field", noSuchFieldException); plugin.getLog().warn("Cannot access proxy field", noSuchFieldException);
} }
return false; return false;
} }
private boolean isVelocityEnabled() {
if (isProxySupported("com.destroystokyo.paper.PaperConfig", "velocitySupport")) {
return true;
}
try {
Object global = Class.forName("io.papermc.paper.configuration.GlobalConfiguration").getDeclaredMethod("get").invoke(null);
Object proxiesConfiguration = global.getClass().getDeclaredField("proxies").get(global);
Object velocityConfig = proxiesConfiguration.getClass().getDeclaredField("velocity").get(proxiesConfiguration);
return velocityConfig.getClass().getDeclaredField("enabled").getBoolean(velocityConfig);
} catch (NoSuchMethodException | ClassNotFoundException | InvocationTargetException | IllegalAccessException |
NoSuchFieldException e) {
plugin.getLog().info("Errror", e);
}
return false;
}
private boolean detectProxy() { private boolean detectProxy() {
return isProxySupported("org.spigotmc.SpigotConfig", "bungee") return isProxySupported("org.spigotmc.SpigotConfig", "bungee")
|| isVelocityEnabled(); || isProxySupported("com.destroystokyo.paper.PaperConfig", "velocitySupport");
} }
private void registerPluginChannels() { private void registerPluginChannels() {