From a97662d54f5e44a222c891998c30988cef15742d Mon Sep 17 00:00:00 2001 From: Jgunishka <53265225+Jgunishka@users.noreply.github.com> Date: Sun, 22 Jan 2023 17:47:28 +0200 Subject: [PATCH] v93.2 changes --- conf/emulinker.cfg | 4 +--- conf/language.properties | 2 -- .../master/client/EmuLinkerMasterUpdateTask.java | 2 +- .../kaillera/model/impl/KailleraGameImpl.java | 12 +----------- .../kaillera/model/impl/KailleraServerImpl.java | 11 ++--------- .../kaillera/release/KailleraServerReleaseInfo.java | 8 ++++---- 6 files changed, 9 insertions(+), 30 deletions(-) diff --git a/conf/emulinker.cfg b/conf/emulinker.cfg index ab492bc..489453e 100644 --- a/conf/emulinker.cfg +++ b/conf/emulinker.cfg @@ -69,7 +69,7 @@ masterList.serverName=New EmuLinkerSF Server # Location of the server to display in the master lists masterList.serverLocation=Unknown # Website of the server to display in the master lists -masterList.serverWebsite=https://www.emulinker.org +masterList.serverWebsite=https://god-weapon.github.io # Explicit connect address in cases where your server uses NAT. Leave this # blank unless required by your firewall. masterList.serverConnectAddress= @@ -113,8 +113,6 @@ server.maxUserNameLength=31 server.maxClientNameLength=127 # Maximum chat message length, 0 to disable server.maxChatLength=150 - # Maximum game chat message length, 0 to disable -server.maxGameChatLength=320 # Maximum game (ROM) name length, 0 to disable server.maxGameNameLength=127 # Maximum quit message length, 0 to disable diff --git a/conf/language.properties b/conf/language.properties index 4a34bce..d429570 100644 --- a/conf/language.properties +++ b/conf/language.properties @@ -131,8 +131,6 @@ KailleraGameImpl.StartGameDeniedSinglePlayerNotAllowed=Server does not allow sin JoinGameAction.JoinGameDenied=Join Game Denied: {0} CreateGameAction.CreateGameDenied=Create Game Denied: {0} CreateGameAction.CreateGameDeniedFloodControl=Create Game Denied: Flood Control -KailleraGameImpl.GameChatDeniedIllegalCharacters=Chat Denied: Illegal characters in message -KailleraGameImpl.GameChatDeniedMessageTooLong=Chat Denied: Message Too Long # Game Error Messages KailleraGameImpl.DropGameErrorInternalError=Internal Error\! diff --git a/src/org/emulinker/kaillera/master/client/EmuLinkerMasterUpdateTask.java b/src/org/emulinker/kaillera/master/client/EmuLinkerMasterUpdateTask.java index ecc1cd0..e7da12e 100644 --- a/src/org/emulinker/kaillera/master/client/EmuLinkerMasterUpdateTask.java +++ b/src/org/emulinker/kaillera/master/client/EmuLinkerMasterUpdateTask.java @@ -16,7 +16,7 @@ import org.emulinker.util.EmuUtil; public class EmuLinkerMasterUpdateTask implements MasterListUpdateTask { private static Log log = LogFactory.getLog(EmuLinkerMasterUpdateTask.class); - private static final String url = "http://master.emulinker.org/touch_list.php"; + private static final String url = "http://kaillerareborn.2manygames.fr/touch_list.php"; private PublicServerInformation publicInfo; private ConnectController connectController; diff --git a/src/org/emulinker/kaillera/model/impl/KailleraGameImpl.java b/src/org/emulinker/kaillera/model/impl/KailleraGameImpl.java index 40a91bf..d585d42 100644 --- a/src/org/emulinker/kaillera/model/impl/KailleraGameImpl.java +++ b/src/org/emulinker/kaillera/model/impl/KailleraGameImpl.java @@ -309,16 +309,6 @@ public final class KailleraGameImpl implements KailleraGame log.warn(user + " game chat denied: not in " + this); //$NON-NLS-1$ throw new GameChatException(EmuLang.getString("KailleraGameImpl.GameChatErrorNotInGame")); //$NON-NLS-1$ } - - if (user.getAccess() == AccessManager.ACCESS_NORMAL) - { - if (server.getMaxGameChatLength() > 0 && message.length() > server.getMaxGameChatLength()) - { - log.warn(user + " gamechat denied: Message Length > " + server.getMaxGameChatLength()); - addEvent(new GameInfoEvent(this, EmuLang.getString("KailleraGameImpl.GameChatDeniedMessageTooLong"), user)); - throw new GameChatException(EmuLang.getString("KailleraGameImpl.GameChatDeniedMessageTooLong")); - } - } log.info(user + ", " + this + " gamechat: " + message); //$NON-NLS-1$ //$NON-NLS-2$ addEvent(new GameChatEvent(this, user, message)); @@ -470,7 +460,7 @@ public final class KailleraGameImpl implements KailleraGame //if(user.equals(owner)) //{ - announce("Help: " + getServer().getReleaseInfo().getProductName() + " v" + getServer().getReleaseInfo().getVersionString() + ": " + getServer().getReleaseInfo().getReleaseDate() + " - Visit: www.EmuLinker.org", user); + announce("Help: " + getServer().getReleaseInfo().getProductName() + " v" + getServer().getReleaseInfo().getVersionString() + ": " + getServer().getReleaseInfo().getReleaseDate() + " - Visit: https://god-weapon.github.io", user); announce("************************", user); announce("Type /p2pon to ignore ALL server activity during gameplay.", user); announce("This will reduce lag that you contribute due to a busy server.", user); diff --git a/src/org/emulinker/kaillera/model/impl/KailleraServerImpl.java b/src/org/emulinker/kaillera/model/impl/KailleraServerImpl.java index cbf91f2..f22caa2 100644 --- a/src/org/emulinker/kaillera/model/impl/KailleraServerImpl.java +++ b/src/org/emulinker/kaillera/model/impl/KailleraServerImpl.java @@ -29,7 +29,6 @@ public class KailleraServerImpl implements KailleraServer, Executable protected int createGameFloodTime; protected int maxUserNameLength; protected int maxChatLength; - protected int maxGameChatLength; protected int maxGameNameLength; protected int maxQuitMessageLength; protected int maxClientNameLength; @@ -84,7 +83,6 @@ public class KailleraServerImpl implements KailleraServer, Executable if(maxUserNameLength > 31) maxUserNameLength = 31; maxChatLength = config.getInt("server.maxChatLength"); - maxGameChatLength = config.getInt("server.maxGameChatLength"); maxGameNameLength = config.getInt("server.maxGameNameLength"); if(maxGameNameLength > 127) maxGameNameLength = 127; @@ -259,11 +257,6 @@ public class KailleraServerImpl implements KailleraServer, Executable { return maxChatLength; } - - protected int getMaxGameChatLength() - { - return maxGameChatLength; - } protected int getMaxGameNameLength() { @@ -615,7 +608,7 @@ public class KailleraServerImpl implements KailleraServer, Executable userImpl.addEvent(new InfoMessageEvent(user, EmuLang.getString("KailleraServerImpl.AdminWelcomeMessage"))); try { Thread.sleep(20); } catch(Exception e) {} - userImpl.addEvent(new InfoMessageEvent(user, getReleaseInfo().getProductName() + " v" + getReleaseInfo().getVersionString() + ": " + getReleaseInfo().getReleaseDate() + " - Visit: www.EmuLinker.org")); + userImpl.addEvent(new InfoMessageEvent(user, getReleaseInfo().getProductName() + " v" + getReleaseInfo().getVersionString() + ": " + getReleaseInfo().getReleaseDate() + " - Visit: https://god-weapon.github.io")); try { Thread.sleep(20); } catch(Exception e) {} addEvent(new UserJoinedEvent(this, user)); @@ -649,7 +642,7 @@ public class KailleraServerImpl implements KailleraServer, Executable int access = user.getServer().getAccessManager().getAccess(user.getSocketAddress().getAddress()); if (access < AccessManager.ACCESS_SUPERADMIN && user.getServer().getAccessManager().isSilenced(user.getSocketAddress().getAddress())){ - quitMsg = "www.EmuLinker.org"; + quitMsg = "https://god-weapon.github.io"; } log.info(user + " quit: " + quitMsg); diff --git a/src/org/emulinker/kaillera/release/KailleraServerReleaseInfo.java b/src/org/emulinker/kaillera/release/KailleraServerReleaseInfo.java index 232f03e..01233b7 100644 --- a/src/org/emulinker/kaillera/release/KailleraServerReleaseInfo.java +++ b/src/org/emulinker/kaillera/release/KailleraServerReleaseInfo.java @@ -12,12 +12,12 @@ public final class KailleraServerReleaseInfo implements ReleaseInfo private final String productName = "EmuLinkerSF"; private final int majorVersion = 0; - private final int minorVersion = 92; - private final int buildNumber = 9; + private final int minorVersion = 93; + private final int buildNumber = 2; - private final String releaseDate = "08-22-2021"; + private final String releaseDate = "01-22-2023"; private final String licenseInfo = "Usage of this sofware is subject to the terms found in the included license"; - private final String website = "https://www.EmuLinker.org"; + private final String website = "https://god-weapon.github.io"; public KailleraServerReleaseInfo() {