eaglercraft/eaglercraft-1.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(1.2.6) Fixed EaglerXBungee always reported as "cracked"

Browse Source
This commit is contained in:
lax1dude 2024-06-16 11:16:01 -07:00
parent 6f7f4ed46b
commit 0827a320cd
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
gateway/EaglercraftXBungee/EaglerXBungee-Latest.jar
View File

Binary file not shown.

6
gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/EaglerXBungee.java
View File

@ -57,8 +57,8 @@ import net.md_5.bungee.BungeeCord;
*/ */
public class EaglerXBungee extends Plugin { public class EaglerXBungee extends Plugin {
public static final String NATIVE_BUNGEECORD_BUILD = "1.20-R0.3-SNAPSHOT:e7e0b97:1845"; public static final String NATIVE_BUNGEECORD_BUILD = "1.21-R0.1-SNAPSHOT:8a88ce4:1849";
public static final String NATIVE_WATERFALL_BUILD = "1.20-R0.3-SNAPSHOT:a65bb68:578"; public static final String NATIVE_WATERFALL_BUILD = "1.21-R0.1-SNAPSHOT:de8345a:579";
static { static {
CompatWarning.displayCompatWarning(); CompatWarning.displayCompatWarning();
@ -121,6 +121,7 @@ public class EaglerXBungee extends Plugin {
mgr.registerCommand(this, new CommandConfirmCode()); mgr.registerCommand(this, new CommandConfirmCode());
mgr.registerCommand(this, new CommandDomain()); mgr.registerCommand(this, new CommandDomain());
EaglerAuthConfig authConf = conf.getAuthConfig(); EaglerAuthConfig authConf = conf.getAuthConfig();
conf.setCracked(!BungeeCord.getInstance().getConfig().isOnlineMode() || !authConf.isEnableAuthentication());
if(authConf.isEnableAuthentication() && authConf.isUseBuiltInAuthentication()) { if(authConf.isEnableAuthentication() && authConf.isUseBuiltInAuthentication()) {
if(!BungeeCord.getInstance().getConfig().isOnlineMode()) { if(!BungeeCord.getInstance().getConfig().isOnlineMode()) {
getLogger().severe("Online mode is set to false! Authentication system has been disabled"); 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) { if(conf == null) {
throw new IOException("Config failed to parse!"); throw new IOException("Config failed to parse!");
} }
conf.setCracked(!BungeeCord.getInstance().getConfig().isOnlineMode() || !conf.getAuthConfig().isEnableAuthentication());
HttpWebServer.regenerate404Pages(); HttpWebServer.regenerate404Pages();
} catch (IOException e) { } catch (IOException e) {
throw new IllegalStateException(e); throw new IllegalStateException(e);

7
gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/config/EaglerBungeeConfig.java
View File

@ -267,6 +267,7 @@ public class EaglerBungeeConfig {
private final Set<String> disableVoiceOnServers; private final Set<String> disableVoiceOnServers;
private final boolean disableFNAWSkinsEverywhere; private final boolean disableFNAWSkinsEverywhere;
private final Set<String> disableFNAWSkinsOnServers; private final Set<String> disableFNAWSkinsOnServers;
private boolean isCrackedFlag;
Property[] eaglerPlayersVanillaSkinCached = new Property[] { isEaglerProperty }; Property[] eaglerPlayersVanillaSkinCached = new Property[] { isEaglerProperty };
public String getServerName() { public String getServerName() {
@ -393,7 +394,11 @@ public class EaglerBungeeConfig {
} }
public boolean isCracked() { public boolean isCracked() {
return true; return isCrackedFlag;
}
public void setCracked(boolean cracked) {
isCrackedFlag = cracked;
} }
public EaglerAuthConfig getAuthConfig() { public EaglerAuthConfig getAuthConfig() {

1
gateway/EaglercraftXBungee/src/main/java/net/lax1dude/eaglercraft/v1_8/plugin/gateway_bungeecord/server/query/QueryManager.java
View File

@ -79,7 +79,6 @@ public class QueryManager {
PluginDescription desc = plugin.getDescription(); PluginDescription desc = plugin.getDescription();
json.addProperty("vers", "EaglerXBungee/" + desc.getVersion()); json.addProperty("vers", "EaglerXBungee/" + desc.getVersion());
json.addProperty("cracked", conf.isCracked()); json.addProperty("cracked", conf.isCracked());
json.addProperty("secure", false);
json.addProperty("time", System.currentTimeMillis()); json.addProperty("time", System.currentTimeMillis());
json.addProperty("uuid", conf.getServerUUID().toString()); json.addProperty("uuid", conf.getServerUUID().toString());
return json; return json;

2
gateway/EaglercraftXBungee/src/main/resources/plugin.yml
View File

@ -1,5 +1,5 @@
name: EaglercraftXBungee name: EaglercraftXBungee
main: net.lax1dude.eaglercraft.v1_8.plugin.gateway_bungeecord.EaglerXBungee 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 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 author: lax1dude

2
gateway_version
View File

@ -1 +1 @@
1.2.5 1.2.6