diff --git a/client_version b/client_version index 92a7e70..fca9ed6 100644 --- a/client_version +++ b/client_version @@ -1 +1 @@ -u30 \ No newline at end of file +u31 \ No newline at end of file diff --git a/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.edit.java b/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.edit.java index 18aca1d..412e71c 100644 --- a/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.edit.java +++ b/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.edit.java @@ -53,9 +53,11 @@ > DELETE 1 @ 1 : 5 -> DELETE 2 @ 2 : 4 +> CHANGE 2 : 3 @ 2 : 5 -> CHANGE 3 : 5 @ 3 : 9 +~ this.maxPlayers = 100; + +> CHANGE 2 : 4 @ 2 : 8 ~ public void initializeConnectionToPlayer(IntegratedServerPlayerNetworkManager netManager, EntityPlayerMP playerIn) { ~ GameProfile gameprofile1 = playerIn.getGameProfile(); @@ -131,14 +133,12 @@ + } + -> CHANGE 4 : 11 @ 4 : 11 +> CHANGE 4 : 9 @ 4 : 11 ~ public String allowUserToConnect(GameProfile gameprofile) { -~ return this.playerEntityList.size() >= this.maxPlayers && !this.func_183023_f(gameprofile) -~ ? "The server is full!" -~ : (doesPlayerAlreadyExist(gameprofile) -~ ? "\"" + gameprofile.getName() + "\" is already playing on this world!" -~ : null); +~ return doesPlayerAlreadyExist(gameprofile) +~ ? "\"" + gameprofile.getName() + "\" is already playing on this world!" +~ : null; ~ } > CHANGE 1 : 7 @ 1 : 9 diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java index 50b840a..d81ec0f 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java @@ -10,7 +10,7 @@ public class EaglercraftVersion { /// Customize these to fit your fork: public static final String projectForkName = "EaglercraftX"; - public static final String projectForkVersion = "u30"; + public static final String projectForkVersion = "u31"; public static final String projectForkVendor = "lax1dude"; public static final String projectForkURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; @@ -20,7 +20,7 @@ public class EaglercraftVersion { public static final String projectOriginName = "EaglercraftX"; public static final String projectOriginAuthor = "lax1dude"; public static final String projectOriginRevision = "1.8"; - public static final String projectOriginVersion = "u30"; + public static final String projectOriginVersion = "u31"; public static final String projectOriginURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; // rest in peace @@ -31,7 +31,7 @@ public class EaglercraftVersion { public static final boolean enableUpdateService = true; public static final String updateBundlePackageName = "net.lax1dude.eaglercraft.v1_8.client"; - public static final int updateBundlePackageVersionInt = 30; + public static final int updateBundlePackageVersionInt = 31; public static final String updateLatestLocalStorageKey = "latestUpdate_" + updateBundlePackageName; diff --git a/sources/resources/plugin_download.zip b/sources/resources/plugin_download.zip index 7ce5830..22d2e39 100644 Binary files a/sources/resources/plugin_download.zip and b/sources/resources/plugin_download.zip differ diff --git a/sources/resources/plugin_version.json b/sources/resources/plugin_version.json index d002100..8e05487 100644 --- a/sources/resources/plugin_version.json +++ b/sources/resources/plugin_version.json @@ -1 +1 @@ -{"pluginName":"EaglercraftXBungee","pluginVersion":"1.2.0","pluginButton":"Download \"EaglerXBungee-1.2.0.jar\"","pluginFilename":"EaglerXBungee.zip"} \ No newline at end of file +{"pluginName":"EaglercraftXBungee","pluginVersion":"1.2.1","pluginButton":"Download \"EaglerXBungee-1.2.1.jar\"","pluginFilename":"EaglerXBungee.zip"} \ No newline at end of file diff --git a/sources/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java b/sources/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java index 2b89f13..a679dde 100644 --- a/sources/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java +++ b/sources/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java @@ -79,7 +79,7 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter { logInvalidCerts = EaglercraftVersion.enableUpdateService && !demoMode && eaglercraftXOpts.getLogInvalidCerts(false); enableSignatureBadge = eaglercraftXOpts.getEnableSignatureBadge(false); allowVoiceClient = eaglercraftXOpts.getAllowVoiceClient(true); - allowFNAWSkins = eaglercraftXOpts.getAllowFNAWSkins(true); + allowFNAWSkins = !demoMode && eaglercraftXOpts.getAllowFNAWSkins(true); localStorageNamespace = eaglercraftXOpts.getLocalStorageNamespace(EaglercraftVersion.localStorageNamespace); JSEaglercraftXOptsHooks hooksObj = eaglercraftXOpts.getHooks(); if(hooksObj != null) {