v92.4 changes

conf/emulinker.cfg

@@ -69,15 +69,14 @@ 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://github.com/god-weapon
+masterList.serverWebsite=https://www.emulinker.org
  # Explicit connect address in cases where your server uses NAT.  Leave this 
  # blank unless required by your firewall.
 masterList.serverConnectAddress=
  # Set to true to list your server on the original kaillera.com master.
 masterList.touchKaillera=true
- # Set to true to list your server on the emulinker.org/anti3d.com master
+ # Set to true to list your server on the emulinker.org master.
- # !No longer exist. Keep this false, to not show errors in the log.
+masterList.touchEmulinker=true
-masterList.touchEmulinker=false
  # Set both of the above to false to run a private server!
 
  # GENERAL SERVER CHECKS AND CONTROL CONFIGURATION
@@ -100,7 +99,7 @@ server.allowMultipleConnections=true
 server.keepAliveTimeout=190
  # Seconds of inactivity before a user is removed for a Idle Timeout
  # 900 = 15 minutes of idling before being removed, 0 to disable
-server.idleTimeout=900
+server.idleTimeout=0
 
  # FLOOD CONTROL AND HACKER PREVENTION CONFIGURATION
  # =================================================

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://170.39.225.176/touch_list.php";
+	private static final String		url	= "http://master.emulinker.org/touch_list.php";
 
 	private PublicServerInformation	publicInfo;
 	private ConnectController		connectController;
@@ -63,22 +63,18 @@ public class EmuLinkerMasterUpdateTask implements MasterListUpdateTask
 		params[2] = new NameValuePair("location", publicInfo.getLocation());
 		params[3] = new NameValuePair("website", publicInfo.getWebsite());
 		params[4] = new NameValuePair("port", Integer.toString(connectController.getBindPort()));
-		//params[5] = new NameValuePair("connectCount", Integer.toString(connectController.getConnectCount()));
 		params[5] = new NameValuePair("numUsers", Integer.toString(kailleraServer.getNumUsers()));
 		params[6] = new NameValuePair("maxUsers", Integer.toString(kailleraServer.getMaxUsers()));
 		params[7] = new NameValuePair("numGames", Integer.toString(kailleraServer.getNumGames()));
-		params[8] = new NameValuePair("maxGames", kailleraServer.getMaxGames() == 0 ? Integer.toString(kailleraServer.getMaxUsers()) : Integer.toString(kailleraServer.getMaxGames()));
+		params[8] = new NameValuePair("maxGames", Integer.toString(kailleraServer.getMaxGames()));
 		params[9] = new NameValuePair("version", "ESF" + releaseInfo.getVersionString());
-		//params[11] = new NameValuePair("build", Integer.toString(releaseInfo.getBuildNumber()));
-		//params[12] = new NameValuePair("isWindows", Boolean.toString(EmuUtil.systemIsWindows()));
 
 		HttpMethod meth = new GetMethod(url);
-		String encpar = EncodingUtil.formUrlEncode(params, System.getProperty("emulinker.charset"));
+		meth.setQueryString(params);
-		meth.setQueryString(encpar);
 		meth.setRequestHeader("Waiting-games", waitingGames.toString());
-		//meth.setFollowRedirects(true);
+		meth.setFollowRedirects(true);
 
-		//Properties props = new Properties();
+		Properties props = new Properties();
 
 		try
 		{
@@ -87,7 +83,7 @@ public class EmuLinkerMasterUpdateTask implements MasterListUpdateTask
 				log.error("Failed to touch EmuLinker Master: " + meth.getStatusLine());
 			else
 			{
-				//props.load(meth.getResponseBodyAsStream());
+				props.load(meth.getResponseBodyAsStream());
 				log.info("Touching EmuLinker Master done");
 			}
 		}
@@ -109,13 +105,13 @@ public class EmuLinkerMasterUpdateTask implements MasterListUpdateTask
 			}
 		}
 
-		/*String updateAvailable = props.getProperty("updateAvailable");
+		String updateAvailable = props.getProperty("updateAvailable");
 		if (updateAvailable != null && updateAvailable.equalsIgnoreCase("true"))
 		{
 			String latestVersion = props.getProperty("latest");
 			String notes = props.getProperty("notes");
 			StringBuilder sb = new StringBuilder();
-			sb.append("A updated version of EmuLinker is available: ");
+			sb.append("A updated version of EmuLinkerSF is available: ");
 			sb.append(latestVersion);
 			if (notes != null)
 			{
@@ -124,6 +120,6 @@ public class EmuLinkerMasterUpdateTask implements MasterListUpdateTask
 				sb.append(")");
 			}
 			log.warn(sb.toString());
-		}*/
+		}
 	}
 }

src/org/emulinker/kaillera/model/impl/KailleraGameImpl.java

@@ -470,7 +470,7 @@ public final class KailleraGameImpl implements KailleraGame
 		//if(user.equals(owner))
 		//{
 
-			announce("Help: " + getServer().getReleaseInfo().getProductName() + " v" + getServer().getReleaseInfo().getVersionString() + ": " + getServer().getReleaseInfo().getReleaseDate() + " - Visit: https://god-weapon.github.io", user);
+			announce("Help: " + getServer().getReleaseInfo().getProductName() + " v" + getServer().getReleaseInfo().getVersionString() + ": " + getServer().getReleaseInfo().getReleaseDate() + " - Visit: www.EmuLinker.org", 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);

src/org/emulinker/kaillera/model/impl/KailleraServerImpl.java

@@ -615,7 +615,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: https://god-weapon.github.io"));		
+		userImpl.addEvent(new InfoMessageEvent(user, getReleaseInfo().getProductName() + " v" + getReleaseInfo().getVersionString() + ": " + getReleaseInfo().getReleaseDate() + " - Visit: www.EmuLinker.org"));		
 		
 		try { Thread.sleep(20); } catch(Exception e) {}
 		addEvent(new UserJoinedEvent(this, user));
@@ -649,7 +649,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 = "https://god-weapon.github.io";
+			quitMsg = "www.EmuLinker.org";
 		}
 
 		log.info(user + " quit: " + quitMsg);

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	= 91;
+	private final int		minorVersion	= 92;
-	private final int		buildNumber		= 0;
+	private final int		buildNumber		= 4;
 
-	private final String	releaseDate		= "03-27-2021";
+	private final String	releaseDate		= "05-06-2021";
 	private final String	licenseInfo		= "Usage of this sofware is subject to the terms found in the included license";
-	private final String	website			= "https://god-weapon.github.io";
+	private final String	website			= "https://www.EmuLinker.org";
 
 	public KailleraServerReleaseInfo()
 	{