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

u31

Browse Source
This commit is contained in:
eaglercraft 2024-05-23 00:05:52 -07:00
parent f89f7486f5
commit f6612ce09e
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktopRuntime/resources/plugin_download.zip
View File

Binary file not shown.

2
desktopRuntime/resources/plugin_version.json
View File

@ -1 +1 @@
{"pluginName":"EaglercraftXBungee","pluginVersion":"1.2.0","pluginButton":"Download \"EaglerXBungee-1.2.0.jar\"","pluginFilename":"EaglerXBungee.zip"} {"pluginName":"EaglercraftXBungee","pluginVersion":"1.2.1","pluginButton":"Download \"EaglerXBungee-1.2.1.jar\"","pluginFilename":"EaglerXBungee.zip"}

6
src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java
View File

@ -10,7 +10,7 @@ public class EaglercraftVersion {
/// Customize these to fit your fork: /// Customize these to fit your fork:
public static final String projectForkName = "EaglercraftX"; 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 projectForkVendor = "lax1dude";
public static final String projectForkURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; 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 projectOriginName = "EaglercraftX";
public static final String projectOriginAuthor = "lax1dude"; public static final String projectOriginAuthor = "lax1dude";
public static final String projectOriginRevision = "1.8"; 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 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 boolean enableUpdateService = true;
public static final String updateBundlePackageName = "net.lax1dude.eaglercraft.v1_8.client"; 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; public static final String updateLatestLocalStorageKey = "latestUpdate_" + updateBundlePackageName;

10
src/main/java/net/minecraft/server/management/ServerConfigurationManager.java
View File

@ -110,7 +110,7 @@ public abstract class ServerConfigurationManager {
public ServerConfigurationManager(MinecraftServer server) { public ServerConfigurationManager(MinecraftServer server) {
this.playerStatFiles = Maps.newHashMap(); this.playerStatFiles = Maps.newHashMap();
this.mcServer = server; this.mcServer = server;
this.maxPlayers = 8; this.maxPlayers = 100;
} }
public void initializeConnectionToPlayer(IntegratedServerPlayerNetworkManager netManager, EntityPlayerMP playerIn) { public void initializeConnectionToPlayer(IntegratedServerPlayerNetworkManager netManager, EntityPlayerMP playerIn) {
@ -365,11 +365,9 @@ public abstract class ServerConfigurationManager {
* server. Returns null on success, or an error message * server. Returns null on success, or an error message
*/ */
public String allowUserToConnect(GameProfile gameprofile) { public String allowUserToConnect(GameProfile gameprofile) {
return this.playerEntityList.size() >= this.maxPlayers && !this.func_183023_f(gameprofile) return doesPlayerAlreadyExist(gameprofile)
? "The server is full!" ? "\"" + gameprofile.getName() + "\" is already playing on this world!"
: (doesPlayerAlreadyExist(gameprofile) : null;
? "\"" + gameprofile.getName() + "\" is already playing on this world!"
: null);
} }
private boolean doesPlayerAlreadyExist(GameProfile gameprofile) { private boolean doesPlayerAlreadyExist(GameProfile gameprofile) {

2
src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java
View File

@ -79,7 +79,7 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter {
logInvalidCerts = EaglercraftVersion.enableUpdateService && !demoMode && eaglercraftXOpts.getLogInvalidCerts(false); logInvalidCerts = EaglercraftVersion.enableUpdateService && !demoMode && eaglercraftXOpts.getLogInvalidCerts(false);
enableSignatureBadge = eaglercraftXOpts.getEnableSignatureBadge(false); enableSignatureBadge = eaglercraftXOpts.getEnableSignatureBadge(false);
allowVoiceClient = eaglercraftXOpts.getAllowVoiceClient(true); allowVoiceClient = eaglercraftXOpts.getAllowVoiceClient(true);
allowFNAWSkins = eaglercraftXOpts.getAllowFNAWSkins(true); allowFNAWSkins = !demoMode && eaglercraftXOpts.getAllowFNAWSkins(true);
localStorageNamespace = eaglercraftXOpts.getLocalStorageNamespace(EaglercraftVersion.localStorageNamespace); localStorageNamespace = eaglercraftXOpts.getLocalStorageNamespace(EaglercraftVersion.localStorageNamespace);
JSEaglercraftXOptsHooks hooksObj = eaglercraftXOpts.getHooks(); JSEaglercraftXOptsHooks hooksObj = eaglercraftXOpts.getHooks();
if(hooksObj != null) { if(hooksObj != null) {