projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-09-12 22:45:18 -04:00
Code Issues Projects Releases Wiki Activity

Added LoginIncorrectClientId packet for when the user/pass don't match

Browse Source
This commit is contained in:
Obique
2015-02-22 23:34:38 -06:00
committed by Obique
parent e754f286a8
commit 043db7a02c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/player/LoginService.java
+11 -2
View File
@@ -4,7 +4,6 @@ import intents.GalacticIntent;
import intents.LoginEventIntent;
import intents.LoginEventIntent.LoginEvent;
import java.nio.charset.Charset;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -28,6 +27,7 @@ import network.packets.swg.login.LoginClientId;
import network.packets.swg.login.LoginClientToken;
import network.packets.swg.login.LoginClusterStatus;
import network.packets.swg.login.LoginEnumCluster;
import network.packets.swg.login.LoginIncorrectClientId;
import network.packets.swg.login.ServerId;
import network.packets.swg.login.ServerString;
import network.packets.swg.login.StationIdHasJediSlot;
@@ -43,6 +43,7 @@ import resources.player.Player;
import resources.player.PlayerState;
import resources.server_info.RelationalDatabase;
import resources.services.Config;
import services.EngineManager;
public class LoginService extends Service {
@@ -84,6 +85,13 @@ public class LoginService extends Service {
handleCharDeletion(intent, player, (DeleteCharacterRequest) p);
}
private String getServerString() {
Config c = getConfig(ConfigFile.PRIMARY);
String name = c.getString("LOGIN-SERVER-NAME", "LoginServer");
int id = c.getInt("LOGIN-SERVER-ID", 1);
return name + ":" + id;
}
private void sendServerInfo(Player player) {
Config c = getConfig(ConfigFile.PRIMARY);
String name = c.getString("LOGIN-SERVER-NAME", "LoginServer");
@@ -179,7 +187,8 @@ public class LoginService extends Service {
}
message += "\n\nMake sure to login to forums first!";
sendPacket(player.getNetworkId(), new ErrorMessage(type, message, false));
sendPacket(player, new LoginIncorrectClientId(getServerString(), EngineManager.SERVER_VERSION));
sendPacket(player, new ErrorMessage(type, message, false));
System.err.println("[" + id.getUsername() + "] Invalid user/pass combo! IP: " + id.getAddress() + ":" + id.getPort());
player.setPlayerState(PlayerState.DISCONNECTED);
new LoginEventIntent(player.getNetworkId(), LoginEvent.LOGIN_FAIL_INVALID_USER_PASS).broadcast();