Browse Source

BETA: Enabling warning for Unused Declared Thrown Exception and respective fixes.

Zoey76 13 năm trước cách đây
mục cha
commit
d003645db1
28 tập tin đã thay đổi với 75 bổ sung134 xóa
  1. 5 5
      L2J_Server_BETA/.settings/org.eclipse.jdt.core.prefs
  2. 1 3
      L2J_Server_BETA/java/com/l2jserver/dbinstaller/LauncherCS.java
  3. 1 3
      L2J_Server_BETA/java/com/l2jserver/dbinstaller/LauncherGS.java
  4. 1 3
      L2J_Server_BETA/java/com/l2jserver/dbinstaller/LauncherLS.java
  5. 2 9
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/InstanceManager.java
  6. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/MapRegionManager.java
  7. 1 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Instance.java
  8. 1 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/AuthRequest.java
  9. 1 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/BlowFishKey.java
  10. 1 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/ChangeAccessLevel.java
  11. 1 4
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/ChangePassword.java
  12. 1 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerAuthRequest.java
  13. 1 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerInGame.java
  14. 1 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerLogout.java
  15. 1 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerTracert.java
  16. 1 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/ReplyCharacters.java
  17. 1 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/SendMail.java
  18. 1 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/ServerStatus.java
  19. 1 3
      L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/TempBan.java
  20. 1 1
      L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java
  21. 1 1
      L2J_Server_BETA/java/com/l2jserver/i18n/LanguageControl.java
  22. 1 1
      L2J_Server_BETA/java/com/l2jserver/loginserver/LoginController.java
  23. 43 54
      L2J_Server_BETA/java/com/l2jserver/loginserver/network/clientpackets/RequestAuthLogin.java
  24. 1 3
      L2J_Server_BETA/java/com/l2jserver/loginserver/network/loginserverpackets/AuthResponse.java
  25. 1 5
      L2J_Server_BETA/java/com/l2jserver/loginserver/network/loginserverpackets/ChangePasswordResponse.java
  26. 1 3
      L2J_Server_BETA/java/com/l2jserver/loginserver/network/loginserverpackets/KickPlayer.java
  27. 1 3
      L2J_Server_BETA/java/com/l2jserver/loginserver/network/loginserverpackets/PlayerAuthResponse.java
  28. 1 3
      L2J_Server_BETA/java/com/l2jserver/loginserver/network/loginserverpackets/RequestCharacters.java

+ 5 - 5
L2J_Server_BETA/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
-#Sat Sep 10 15:59:04 UYT 2011
+#Sat Sep 24 23:36:52 UYT 2011
 eclipse.preferences.version=1
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -65,10 +65,10 @@ org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

+ 1 - 3
L2J_Server_BETA/java/com/l2jserver/dbinstaller/LauncherCS.java

@@ -15,8 +15,6 @@
 package com.l2jserver.dbinstaller;
 package com.l2jserver.dbinstaller;
 
 
 import java.awt.HeadlessException;
 import java.awt.HeadlessException;
-import java.io.IOException;
-
 import javax.swing.UIManager;
 import javax.swing.UIManager;
 
 
 import com.l2jserver.dbinstaller.console.DBInstallerConsole;
 import com.l2jserver.dbinstaller.console.DBInstallerConsole;
@@ -31,7 +29,7 @@ import com.l2jserver.dbinstaller.gui.DBConfigGUI;
  */
  */
 public class LauncherCS
 public class LauncherCS
 {
 {
-	public static void main(String[] args) throws IOException
+	public static void main(String[] args)
 	{
 	{
 		String mode = "l2jcs";
 		String mode = "l2jcs";
 		String dir = "../sql/community/";
 		String dir = "../sql/community/";

+ 1 - 3
L2J_Server_BETA/java/com/l2jserver/dbinstaller/LauncherGS.java

@@ -15,8 +15,6 @@
 package com.l2jserver.dbinstaller;
 package com.l2jserver.dbinstaller;
 
 
 import java.awt.HeadlessException;
 import java.awt.HeadlessException;
-import java.io.IOException;
-
 import javax.swing.UIManager;
 import javax.swing.UIManager;
 
 
 import com.l2jserver.dbinstaller.console.DBInstallerConsole;
 import com.l2jserver.dbinstaller.console.DBInstallerConsole;
@@ -31,7 +29,7 @@ import com.l2jserver.dbinstaller.gui.DBConfigGUI;
  */
  */
 public class LauncherGS
 public class LauncherGS
 {
 {
-	public static void main(String[] args) throws IOException
+	public static void main(String[] args)
 	{
 	{
 		String mode = "l2jgs";
 		String mode = "l2jgs";
 		String dir = "../sql/game/";
 		String dir = "../sql/game/";

+ 1 - 3
L2J_Server_BETA/java/com/l2jserver/dbinstaller/LauncherLS.java

@@ -15,8 +15,6 @@
 package com.l2jserver.dbinstaller;
 package com.l2jserver.dbinstaller;
 
 
 import java.awt.HeadlessException;
 import java.awt.HeadlessException;
-import java.io.IOException;
-
 import javax.swing.UIManager;
 import javax.swing.UIManager;
 
 
 import com.l2jserver.dbinstaller.console.DBInstallerConsole;
 import com.l2jserver.dbinstaller.console.DBInstallerConsole;
@@ -31,7 +29,7 @@ import com.l2jserver.dbinstaller.gui.DBConfigGUI;
  */
  */
 public class LauncherLS
 public class LauncherLS
 {
 {
-	public static void main(String[] args) throws IOException
+	public static void main(String[] args)
 	{
 	{
 		String mode = "l2jls";
 		String mode = "l2jls";
 		String dir = "../sql/login/";
 		String dir = "../sql/login/";

+ 2 - 9
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/InstanceManager.java

@@ -314,7 +314,7 @@ public class InstanceManager
 		return true;
 		return true;
 	}
 	}
 	
 	
-	public boolean createInstanceFromTemplate(int id, String template) throws FileNotFoundException
+	public boolean createInstanceFromTemplate(int id, String template)
 	{
 	{
 		if (getInstance(id) != null)
 		if (getInstance(id) != null)
 			return false;
 			return false;
@@ -346,14 +346,7 @@ public class InstanceManager
 		_instanceList.put(_dynamic, instance);
 		_instanceList.put(_dynamic, instance);
 		if (template != null)
 		if (template != null)
 		{
 		{
-			try
-			{
-				instance.loadInstanceTemplate(template);
-			}
-			catch (FileNotFoundException e)
-			{
-				_log.log(Level.WARNING, "InstanceManager: Failed creating instance from template " + template + ", " + e.getMessage(), e);
-			}
+			instance.loadInstanceTemplate(template);
 		}
 		}
 		return _dynamic;
 		return _dynamic;
 	}
 	}

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/MapRegionManager.java

@@ -88,7 +88,7 @@ public class MapRegionManager
 		}
 		}
 	}
 	}
 	
 	
-	private static void load() throws Exception
+	private static void load()
 	{
 	{
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 		factory.setValidating(false);
 		factory.setValidating(false);

+ 1 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Instance.java

@@ -4,7 +4,6 @@ import gnu.trove.TIntHashSet;
 import gnu.trove.TIntProcedure;
 import gnu.trove.TIntProcedure;
 
 
 import java.io.File;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledFuture;
@@ -380,7 +379,7 @@ public class Instance
 		_doors = null;
 		_doors = null;
 	}
 	}
 	
 	
-	public void loadInstanceTemplate(String filename) throws FileNotFoundException
+	public void loadInstanceTemplate(String filename)
 	{
 	{
 		Document doc = null;
 		Document doc = null;
 		File xml = new File(Config.DATAPACK_ROOT, "data/instances/" + filename);
 		File xml = new File(Config.DATAPACK_ROOT, "data/instances/" + filename);

+ 1 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/AuthRequest.java

@@ -14,8 +14,6 @@
  */
  */
 package com.l2jserver.gameserver.network.gameserverpackets;
 package com.l2jserver.gameserver.network.gameserverpackets;
 
 
-import java.io.IOException;
-
 import com.l2jserver.util.network.BaseSendablePacket;
 import com.l2jserver.util.network.BaseSendablePacket;
 
 
 public class AuthRequest extends BaseSendablePacket
 public class AuthRequest extends BaseSendablePacket
@@ -59,7 +57,7 @@ public class AuthRequest extends BaseSendablePacket
 	 * @see com.l2jserver.gameserver.gameserverpackets.GameServerBasePacket#getContent()
 	 * @see com.l2jserver.gameserver.gameserverpackets.GameServerBasePacket#getContent()
 	 */
 	 */
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		return getBytes();
 		return getBytes();
 	}
 	}

+ 1 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/BlowFishKey.java

@@ -14,7 +14,6 @@
  */
  */
 package com.l2jserver.gameserver.network.gameserverpackets;
 package com.l2jserver.gameserver.network.gameserverpackets;
 
 
-import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.GeneralSecurityException;
 import java.security.interfaces.RSAPublicKey;
 import java.security.interfaces.RSAPublicKey;
 import java.util.logging.Level;
 import java.util.logging.Level;
@@ -57,7 +56,7 @@ public class BlowFishKey extends BaseSendablePacket
 	 * @see com.l2jserver.gameserver.gameserverpackets.GameServerBasePacket#getContent()
 	 * @see com.l2jserver.gameserver.gameserverpackets.GameServerBasePacket#getContent()
 	 */
 	 */
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		return getBytes();
 		return getBytes();
 	}
 	}

+ 1 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/ChangeAccessLevel.java

@@ -14,8 +14,6 @@
  */
  */
 package com.l2jserver.gameserver.network.gameserverpackets;
 package com.l2jserver.gameserver.network.gameserverpackets;
 
 
-import java.io.IOException;
-
 import com.l2jserver.util.network.BaseSendablePacket;
 import com.l2jserver.util.network.BaseSendablePacket;
 
 
 /**
 /**
@@ -35,7 +33,7 @@ public class ChangeAccessLevel extends BaseSendablePacket
 	 * @see com.l2jserver.gameserver.gameserverpackets.GameServerBasePacket#getContent()
 	 * @see com.l2jserver.gameserver.gameserverpackets.GameServerBasePacket#getContent()
 	 */
 	 */
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		return getBytes();
 		return getBytes();
 	}
 	}

+ 1 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/ChangePassword.java

@@ -15,13 +15,10 @@
 
 
 package com.l2jserver.gameserver.network.gameserverpackets;
 package com.l2jserver.gameserver.network.gameserverpackets;
 
 
-import java.io.IOException;
-
 import com.l2jserver.util.network.BaseSendablePacket;
 import com.l2jserver.util.network.BaseSendablePacket;
 
 
 /**
 /**
  * @author UnAfraid
  * @author UnAfraid
- *
  */
  */
 public class ChangePassword extends BaseSendablePacket
 public class ChangePassword extends BaseSendablePacket
 {
 {
@@ -35,7 +32,7 @@ public class ChangePassword extends BaseSendablePacket
 	}
 	}
 
 
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		return getBytes();
 		return getBytes();
 	}
 	}

+ 1 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerAuthRequest.java

@@ -14,8 +14,6 @@
  */
  */
 package com.l2jserver.gameserver.network.gameserverpackets;
 package com.l2jserver.gameserver.network.gameserverpackets;
 
 
-import java.io.IOException;
-
 import com.l2jserver.gameserver.LoginServerThread.SessionKey;
 import com.l2jserver.gameserver.LoginServerThread.SessionKey;
 import com.l2jserver.util.network.BaseSendablePacket;
 import com.l2jserver.util.network.BaseSendablePacket;
 
 
@@ -40,7 +38,7 @@ public class PlayerAuthRequest extends BaseSendablePacket
 	 * @see com.l2jserver.gameserver.gameserverpackets.GameServerBasePacket#getContent()
 	 * @see com.l2jserver.gameserver.gameserverpackets.GameServerBasePacket#getContent()
 	 */
 	 */
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		return getBytes();
 		return getBytes();
 	}
 	}

+ 1 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerInGame.java

@@ -14,8 +14,6 @@
  */
  */
 package com.l2jserver.gameserver.network.gameserverpackets;
 package com.l2jserver.gameserver.network.gameserverpackets;
 
 
-import java.io.IOException;
-
 import javolution.util.FastList;
 import javolution.util.FastList;
 
 
 import com.l2jserver.util.network.BaseSendablePacket;
 import com.l2jserver.util.network.BaseSendablePacket;
@@ -45,7 +43,7 @@ public class PlayerInGame extends BaseSendablePacket
 	 * @see com.l2jserver.gameserver.gameserverpackets.GameServerBasePacket#getContent()
 	 * @see com.l2jserver.gameserver.gameserverpackets.GameServerBasePacket#getContent()
 	 */
 	 */
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		return getBytes();
 		return getBytes();
 	}
 	}

+ 1 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerLogout.java

@@ -14,8 +14,6 @@
  */
  */
 package com.l2jserver.gameserver.network.gameserverpackets;
 package com.l2jserver.gameserver.network.gameserverpackets;
 
 
-import java.io.IOException;
-
 import com.l2jserver.util.network.BaseSendablePacket;
 import com.l2jserver.util.network.BaseSendablePacket;
 
 
 /**
 /**
@@ -34,7 +32,7 @@ public class PlayerLogout extends BaseSendablePacket
 	 * @see com.l2jserver.gameserver.gameserverpackets.GameServerBasePacket#getContent()
 	 * @see com.l2jserver.gameserver.gameserverpackets.GameServerBasePacket#getContent()
 	 */
 	 */
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		return getBytes();
 		return getBytes();
 	}
 	}

+ 1 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerTracert.java

@@ -14,8 +14,6 @@
  */
  */
 package com.l2jserver.gameserver.network.gameserverpackets;
 package com.l2jserver.gameserver.network.gameserverpackets;
 
 
-import java.io.IOException;
-
 import com.l2jserver.util.network.BaseSendablePacket;
 import com.l2jserver.util.network.BaseSendablePacket;
 
 
 /**
 /**
@@ -40,7 +38,7 @@ public class PlayerTracert extends BaseSendablePacket
 	 * @see com.l2jserver.gameserver.gameserverpackets.GameServerBasePacket#getContent()
 	 * @see com.l2jserver.gameserver.gameserverpackets.GameServerBasePacket#getContent()
 	 */
 	 */
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		return getBytes();
 		return getBytes();
 	}
 	}

+ 1 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/ReplyCharacters.java

@@ -14,7 +14,6 @@
  */
  */
 package com.l2jserver.gameserver.network.gameserverpackets;
 package com.l2jserver.gameserver.network.gameserverpackets;
 
 
-import java.io.IOException;
 import java.util.List;
 import java.util.List;
 
 
 import com.l2jserver.util.network.BaseSendablePacket;
 import com.l2jserver.util.network.BaseSendablePacket;
@@ -39,7 +38,7 @@ public class ReplyCharacters extends BaseSendablePacket
 	}
 	}
 	
 	
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		return getBytes();
 		return getBytes();
 	}
 	}

+ 1 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/SendMail.java

@@ -14,8 +14,6 @@
  */
  */
 package com.l2jserver.gameserver.network.gameserverpackets;
 package com.l2jserver.gameserver.network.gameserverpackets;
 
 
-import java.io.IOException;
-
 import com.l2jserver.util.network.BaseSendablePacket;
 import com.l2jserver.util.network.BaseSendablePacket;
 
 
 /**
 /**
@@ -40,7 +38,7 @@ public class SendMail extends BaseSendablePacket
 	 * @see com.l2jserver.util.network.BaseSendablePacket#getContent()
 	 * @see com.l2jserver.util.network.BaseSendablePacket#getContent()
 	 */
 	 */
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		return getBytes();
 		return getBytes();
 	}
 	}

+ 1 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/ServerStatus.java

@@ -14,7 +14,6 @@
  */
  */
 package com.l2jserver.gameserver.network.gameserverpackets;
 package com.l2jserver.gameserver.network.gameserverpackets;
 
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.ArrayList;
 
 
 import com.l2jserver.util.network.BaseSendablePacket;
 import com.l2jserver.util.network.BaseSendablePacket;
@@ -86,7 +85,7 @@ public class ServerStatus extends BaseSendablePacket
 	 * @see com.l2jserver.gameserver.gameserverpackets.GameServerBasePacket#getContent()
 	 * @see com.l2jserver.gameserver.gameserverpackets.GameServerBasePacket#getContent()
 	 */
 	 */
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		writeC(0x06);
 		writeC(0x06);
 		writeD(_attributes.size());
 		writeD(_attributes.size());

+ 1 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/network/gameserverpackets/TempBan.java

@@ -14,8 +14,6 @@
  */
  */
 package com.l2jserver.gameserver.network.gameserverpackets;
 package com.l2jserver.gameserver.network.gameserverpackets;
 
 
-import java.io.IOException;
-
 import com.l2jserver.util.network.BaseSendablePacket;
 import com.l2jserver.util.network.BaseSendablePacket;
 
 
 /**
 /**
@@ -48,7 +46,7 @@ public class TempBan extends BaseSendablePacket
 	 * @see com.l2jserver.util.network.BaseSendablePacket#getContent()
 	 * @see com.l2jserver.util.network.BaseSendablePacket#getContent()
 	 */
 	 */
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		return getBytes();
 		return getBytes();
 	}
 	}

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java

@@ -325,7 +325,7 @@ public final class L2ScriptEngineManager
 		}
 		}
 	}
 	}
 	
 	
-	public CompiledScriptCache getCompiledScriptCache() throws IOException
+	public CompiledScriptCache getCompiledScriptCache()
 	{
 	{
 		return _cache;
 		return _cache;
 	}
 	}

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/i18n/LanguageControl.java

@@ -41,7 +41,7 @@ public class LanguageControl extends Control
 	}
 	}
 	
 	
 	@Override
 	@Override
-	public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader, boolean reload) throws IllegalAccessException, InstantiationException, IOException
+	public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader, boolean reload) throws IOException
 	{
 	{
 		if (baseName == null || locale == null || format == null || loader == null)
 		if (baseName == null || locale == null || format == null || loader == null)
 		{
 		{

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/loginserver/LoginController.java

@@ -191,7 +191,7 @@ public class LoginController
 		AUTH_SUCCESS
 		AUTH_SUCCESS
 	}
 	}
 	
 	
-	public AuthLoginResult tryAuthLogin(String account, String password, L2LoginClient client) throws HackingException
+	public AuthLoginResult tryAuthLogin(String account, String password, L2LoginClient client)
 	{
 	{
 		AuthLoginResult ret = AuthLoginResult.INVALID_PASSWORD;
 		AuthLoginResult ret = AuthLoginResult.INVALID_PASSWORD;
 		// check auth
 		// check auth

+ 43 - 54
L2J_Server_BETA/java/com/l2jserver/loginserver/network/clientpackets/RequestAuthLogin.java

@@ -14,7 +14,6 @@
  */
  */
 package com.l2jserver.loginserver.network.clientpackets;
 package com.l2jserver.loginserver.network.clientpackets;
 
 
-import java.net.InetAddress;
 import java.security.GeneralSecurityException;
 import java.security.GeneralSecurityException;
 import java.util.logging.Level;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
@@ -23,7 +22,6 @@ import javax.crypto.Cipher;
 
 
 import com.l2jserver.Config;
 import com.l2jserver.Config;
 import com.l2jserver.loginserver.GameServerTable.GameServerInfo;
 import com.l2jserver.loginserver.GameServerTable.GameServerInfo;
-import com.l2jserver.loginserver.HackingException;
 import com.l2jserver.loginserver.LoginController;
 import com.l2jserver.loginserver.LoginController;
 import com.l2jserver.loginserver.LoginController.AuthLoginResult;
 import com.l2jserver.loginserver.LoginController.AuthLoginResult;
 import com.l2jserver.loginserver.network.L2LoginClient;
 import com.l2jserver.loginserver.network.L2LoginClient;
@@ -114,62 +112,53 @@ public class RequestAuthLogin extends L2LoginClientPacket
 		}
 		}
 		
 		
 		final LoginController lc = LoginController.getInstance();
 		final LoginController lc = LoginController.getInstance();
-		try
+		AuthLoginResult result = lc.tryAuthLogin(_user, _password, client);
+		switch (result)
 		{
 		{
-			AuthLoginResult result = lc.tryAuthLogin(_user, _password, client);
-			switch (result)
-			{
-				case AUTH_SUCCESS:
-					client.setAccount(_user);
-					client.setState(LoginClientState.AUTHED_LOGIN);
-					client.setSessionKey(lc.assignSessionKeyToClient(_user, client));
-					lc.getCharactersOnAccount(_user);
-					if (Config.SHOW_LICENCE)
-					{
-						client.sendPacket(new LoginOk(getClient().getSessionKey()));
-					}
-					else
-					{
-						getClient().sendPacket(new ServerList(getClient()));
-					}
-					break;
-				case INVALID_PASSWORD:
-					client.close(LoginFailReason.REASON_USER_OR_PASS_WRONG);
-					break;
-				case ACCOUNT_BANNED:
-					client.close(new AccountKicked(AccountKickedReason.REASON_PERMANENTLY_BANNED));
-					break;
-				case ALREADY_ON_LS:
-					L2LoginClient oldClient;
-					if ((oldClient = lc.getAuthedClient(_user)) != null)
-					{
-						// kick the other client
-						oldClient.close(LoginFailReason.REASON_ACCOUNT_IN_USE);
-						lc.removeAuthedLoginClient(_user);
-					}
-					// kick also current client
+			case AUTH_SUCCESS:
+				client.setAccount(_user);
+				client.setState(LoginClientState.AUTHED_LOGIN);
+				client.setSessionKey(lc.assignSessionKeyToClient(_user, client));
+				lc.getCharactersOnAccount(_user);
+				if (Config.SHOW_LICENCE)
+				{
+					client.sendPacket(new LoginOk(getClient().getSessionKey()));
+				}
+				else
+				{
+					getClient().sendPacket(new ServerList(getClient()));
+				}
+				break;
+			case INVALID_PASSWORD:
+				client.close(LoginFailReason.REASON_USER_OR_PASS_WRONG);
+				break;
+			case ACCOUNT_BANNED:
+				client.close(new AccountKicked(AccountKickedReason.REASON_PERMANENTLY_BANNED));
+				break;
+			case ALREADY_ON_LS:
+				L2LoginClient oldClient;
+				if ((oldClient = lc.getAuthedClient(_user)) != null)
+				{
+					// kick the other client
+					oldClient.close(LoginFailReason.REASON_ACCOUNT_IN_USE);
+					lc.removeAuthedLoginClient(_user);
+				}
+				// kick also current client
+				client.close(LoginFailReason.REASON_ACCOUNT_IN_USE);
+				break;
+			case ALREADY_ON_GS:
+				GameServerInfo gsi;
+				if ((gsi = lc.getAccountOnGameServer(_user)) != null)
+				{
 					client.close(LoginFailReason.REASON_ACCOUNT_IN_USE);
 					client.close(LoginFailReason.REASON_ACCOUNT_IN_USE);
-					break;
-				case ALREADY_ON_GS:
-					GameServerInfo gsi;
-					if ((gsi = lc.getAccountOnGameServer(_user)) != null)
+					
+					// kick from there
+					if (gsi.isAuthed())
 					{
 					{
-						client.close(LoginFailReason.REASON_ACCOUNT_IN_USE);
-						
-						// kick from there
-						if (gsi.isAuthed())
-						{
-							gsi.getGameServerThread().kickPlayer(_user);
-						}
+						gsi.getGameServerThread().kickPlayer(_user);
 					}
 					}
-					break;
-			}
-		}
-		catch (HackingException e)
-		{
-			InetAddress address = getClient().getConnection().getInetAddress();
-			lc.addBanForAddress(address, Config.LOGIN_BLOCK_AFTER_BAN * 1000);
-			_log.info("Banned (" + address + ") for " + Config.LOGIN_BLOCK_AFTER_BAN + " seconds, due to " + e.getConnects() + " incorrect login attempts.");
+				}
+				break;
 		}
 		}
 	}
 	}
 }
 }

+ 1 - 3
L2J_Server_BETA/java/com/l2jserver/loginserver/network/loginserverpackets/AuthResponse.java

@@ -14,8 +14,6 @@
  */
  */
 package com.l2jserver.loginserver.network.loginserverpackets;
 package com.l2jserver.loginserver.network.loginserverpackets;
 
 
-import java.io.IOException;
-
 import com.l2jserver.loginserver.GameServerTable;
 import com.l2jserver.loginserver.GameServerTable;
 import com.l2jserver.util.network.BaseSendablePacket;
 import com.l2jserver.util.network.BaseSendablePacket;
 
 
@@ -41,7 +39,7 @@ public class AuthResponse extends BaseSendablePacket
 	 * @see com.l2jserver.loginserver.serverpackets.ServerBasePacket#getContent()
 	 * @see com.l2jserver.loginserver.serverpackets.ServerBasePacket#getContent()
 	 */
 	 */
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		return getBytes();
 		return getBytes();
 	}
 	}

+ 1 - 5
L2J_Server_BETA/java/com/l2jserver/loginserver/network/loginserverpackets/ChangePasswordResponse.java

@@ -14,11 +14,8 @@
  */
  */
 package com.l2jserver.loginserver.network.loginserverpackets;
 package com.l2jserver.loginserver.network.loginserverpackets;
 
 
-import java.io.IOException;
-
 import com.l2jserver.util.network.BaseSendablePacket;
 import com.l2jserver.util.network.BaseSendablePacket;
 
 
-
 /**
 /**
  * @author Nik
  * @author Nik
  */
  */
@@ -33,9 +30,8 @@ public class ChangePasswordResponse extends BaseSendablePacket
 	}
 	}
 	
 	
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		return getBytes();
 		return getBytes();
 	}
 	}
-	
 }
 }

+ 1 - 3
L2J_Server_BETA/java/com/l2jserver/loginserver/network/loginserverpackets/KickPlayer.java

@@ -14,8 +14,6 @@
  */
  */
 package com.l2jserver.loginserver.network.loginserverpackets;
 package com.l2jserver.loginserver.network.loginserverpackets;
 
 
-import java.io.IOException;
-
 import com.l2jserver.util.network.BaseSendablePacket;
 import com.l2jserver.util.network.BaseSendablePacket;
 
 
 
 
@@ -35,7 +33,7 @@ public class KickPlayer extends BaseSendablePacket
 	 * @see com.l2jserver.loginserver.serverpackets.ServerBasePacket#getContent()
 	 * @see com.l2jserver.loginserver.serverpackets.ServerBasePacket#getContent()
 	 */
 	 */
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		return getBytes();
 		return getBytes();
 	}
 	}

+ 1 - 3
L2J_Server_BETA/java/com/l2jserver/loginserver/network/loginserverpackets/PlayerAuthResponse.java

@@ -14,8 +14,6 @@
  */
  */
 package com.l2jserver.loginserver.network.loginserverpackets;
 package com.l2jserver.loginserver.network.loginserverpackets;
 
 
-import java.io.IOException;
-
 import com.l2jserver.util.network.BaseSendablePacket;
 import com.l2jserver.util.network.BaseSendablePacket;
 
 
 
 
@@ -36,7 +34,7 @@ public class PlayerAuthResponse extends BaseSendablePacket
 	 * @see com.l2jserver.loginserver.serverpackets.ServerBasePacket#getContent()
 	 * @see com.l2jserver.loginserver.serverpackets.ServerBasePacket#getContent()
 	 */
 	 */
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		return getBytes();
 		return getBytes();
 	}
 	}

+ 1 - 3
L2J_Server_BETA/java/com/l2jserver/loginserver/network/loginserverpackets/RequestCharacters.java

@@ -14,8 +14,6 @@
  */
  */
 package com.l2jserver.loginserver.network.loginserverpackets;
 package com.l2jserver.loginserver.network.loginserverpackets;
 
 
-import java.io.IOException;
-
 import com.l2jserver.util.network.BaseSendablePacket;
 import com.l2jserver.util.network.BaseSendablePacket;
 
 
 /**
 /**
@@ -34,7 +32,7 @@ public class RequestCharacters extends BaseSendablePacket
 	 * @see com.l2jserver.util.network.BaseSendablePacket#getContent()
 	 * @see com.l2jserver.util.network.BaseSendablePacket#getContent()
 	 */
 	 */
 	@Override
 	@Override
-	public byte[] getContent() throws IOException
+	public byte[] getContent()
 	{
 	{
 		return getBytes();
 		return getBytes();
 	}
 	}