diff --git a/gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar b/gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar index 241f289..8bb3b4d 100644 Binary files a/gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar and b/gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar differ diff --git a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/EaglerXBungee.java b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/EaglerXBungee.java index 2285d50..7838915 100644 --- a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/EaglerXBungee.java +++ b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/EaglerXBungee.java @@ -57,8 +57,8 @@ import net.md_5.bungee.BungeeCord; */ public class EaglerXBungee extends Plugin { - public static final String NATIVE_BUNGEECORD_BUILD = "1.20-R0.3-SNAPSHOT:e7e0b97:1845"; - public static final String NATIVE_WATERFALL_BUILD = "1.20-R0.3-SNAPSHOT:a65bb68:578"; + public static final String NATIVE_BUNGEECORD_BUILD = "1.21-R0.1-SNAPSHOT:8a88ce4:1849"; + public static final String NATIVE_WATERFALL_BUILD = "1.21-R0.1-SNAPSHOT:de8345a:579"; static { CompatWarning.displayCompatWarning(); @@ -121,6 +121,7 @@ public class EaglerXBungee extends Plugin { mgr.registerCommand(this, new CommandConfirmCode()); mgr.registerCommand(this, new CommandDomain()); EaglerAuthConfig authConf = conf.getAuthConfig(); + conf.setCracked(!BungeeCord.getInstance().getConfig().isOnlineMode() || !authConf.isEnableAuthentication()); if(authConf.isEnableAuthentication() && authConf.isUseBuiltInAuthentication()) { if(!BungeeCord.getInstance().getConfig().isOnlineMode()) { getLogger().severe("Online mode is set to false! Authentication system has been disabled"); @@ -254,6 +255,7 @@ public class EaglerXBungee extends Plugin { if(conf == null) { throw new IOException("Config failed to parse!"); } + conf.setCracked(!BungeeCord.getInstance().getConfig().isOnlineMode() || !conf.getAuthConfig().isEnableAuthentication()); HttpWebServer.regenerate404Pages(); } catch (IOException e) { throw new IllegalStateException(e); diff --git a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/config/EaglerBungeeConfig.java b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/config/EaglerBungeeConfig.java index 252bdd3..20660b7 100644 --- a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/config/EaglerBungeeConfig.java +++ b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/config/EaglerBungeeConfig.java @@ -267,6 +267,7 @@ public class EaglerBungeeConfig { private final Set disableVoiceOnServers; private final boolean disableFNAWSkinsEverywhere; private final Set disableFNAWSkinsOnServers; + private boolean isCrackedFlag; Property[] eaglerPlayersVanillaSkinCached = new Property[] { isEaglerProperty }; public String getServerName() { @@ -393,7 +394,11 @@ public class EaglerBungeeConfig { } public boolean isCracked() { - return true; + return isCrackedFlag; + } + + public void setCracked(boolean cracked) { + isCrackedFlag = cracked; } public EaglerAuthConfig getAuthConfig() { diff --git a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/query/QueryManager.java b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/query/QueryManager.java index e8c13be..0620b62 100644 --- a/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/query/QueryManager.java +++ b/gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/query/QueryManager.java @@ -79,7 +79,6 @@ public class QueryManager { PluginDescription desc = plugin.getDescription(); json.addProperty("vers", "EaglerXBungee/" + desc.getVersion()); json.addProperty("cracked", conf.isCracked()); - json.addProperty("secure", false); json.addProperty("time", System.currentTimeMillis()); json.addProperty("uuid", conf.getServerUUID().toString()); return json; diff --git a/gateway/EaglercraftXBungee/src/main/resources/plugin.yml b/gateway/EaglercraftXBungee/src/main/resources/plugin.yml index d35eb35..6ac7f97 100644 --- a/gateway/EaglercraftXBungee/src/main/resources/plugin.yml +++ b/gateway/EaglercraftXBungee/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: EaglercraftXBungee main: net.lax1dude.eaglercraft.v1_8.plugin.gateway_bungeecord.EaglerXBungee -version: 1.2.5 +version: 1.2.6 description: Plugin to allow EaglercraftX 1.8 players to join your network, or allow EaglercraftX 1.8 players to use your network as a proxy to join other networks author: lax1dude \ No newline at end of file diff --git a/gateway_version b/gateway_version index 3a1f10e..7e099ec 100644 --- a/gateway_version +++ b/gateway_version @@ -1 +1 @@ -1.2.5 \ No newline at end of file +1.2.6 \ No newline at end of file