projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-13 03:13:26 -04:00
Code Issues Projects Releases Wiki Activity

Merge conflict resolve

Browse Source
This commit is contained in:
CharonInferar
2014-08-09 18:17:01 +02:00
parent 79d56ca4ef a8a824b8a7
commit 0f8466bf44
1452 changed files with 14987 additions and 14349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/LoginService.java
+33 -7
View File
@@ -56,6 +56,7 @@ import protocol.swg.ServerNowEpochTime;
import protocol.swg.StationIdHasJediSlot;
import resources.common.*;
import resources.datatables.PlayerFlags;
import resources.guild.Guild;
import resources.objects.creature.CreatureObject;
@SuppressWarnings("unused")
@@ -92,6 +93,11 @@ public class LoginService implements INetworkDispatch{
public void handlePacket(IoSession session, IoBuffer data) throws Exception {
if (session == null) {
System.out.println("Login attempted with NULL session!");
return;
}
data = data.order(ByteOrder.LITTLE_ENDIAN);
LoginClientId clientID = new LoginClientId();
data.position(0);
@@ -116,16 +122,19 @@ public class LoginService implements INetworkDispatch{
err = "user is banned";
break;
}
ErrorMessage errMsg = new ErrorMessage("Invalid Login", err);
// No matter what, this will always show that the login server is unavailable at this time. Removing the error message will just keep the connecting message up.
ErrorMessage errMsg = new ErrorMessage("Wrong Password", "The username or password you entered was incorrect.");
session.write(errMsg.serialize());
Disconnect disconnect = new Disconnect((Integer)session.getAttribute("connectionId"), 6);
session.write(disconnect);
session.close(false);
// Closing the session for some reason will not show any error messages, even if write messages are queued..
//As result, the infinite "Connection to the login server is now open..." loop., also it randomly denies any logins from that client for some reason
return;
}
System.out.println(user + " successfully logged in.");
Client client = new Client(session.getRemoteAddress());
client.setAccountName(user);
client.setPassword(pass);
@@ -137,6 +146,16 @@ public class LoginService implements INetworkDispatch{
core.addClient(session, client);
if (!core.getActiveConnectionsMap().containsKey(session)) {
Disconnect disconnect = new Disconnect((Integer)session.getAttribute("connectionId"), 6);
session.write(disconnect);
ErrorMessage errMsg = new ErrorMessage("Error Logging In", "Your client could not be added to the connections at this time.");
session.write(errMsg.serialize());
session.close(false);
System.out.println(client.getAccountName() + " was not added to active connections map.");
return;
}
/*if(!checkIfAccountExistInGameDB(id)) {
createAccountForGameDB(id, user, email, encryptPass);
}*/
@@ -155,9 +174,7 @@ public class LoginService implements INetworkDispatch{
//tools.CharonPacketUtils.printAnalysis(time.serialize(), "ServerNowEpochTime");
if (client.getSession().containsAttribute("tradeSession") == true) {
System.out.println("Has attribute: " + session.getAttribute("tradeSession").toString());
client.getSession().removeAttribute("tradeSession");
System.out.println("Removed tradeSession Attribute @ LoginService.java");
}
session.write(time.serialize());
@@ -167,6 +184,8 @@ public class LoginService implements INetworkDispatch{
session.write(serverStatus.serialize());
session.write(jediSlot.serialize());
session.write(characters.serialize());
System.out.println(user + " successfully logged in.");
}
});
@@ -216,6 +235,12 @@ public class LoginService implements INetworkDispatch{
if (object.getGuildId() != 0)
core.guildService.getGuildById(object.getGuildId()).getMembers().remove(object.getObjectID());
Guild guild = core.guildService.getGuildById(((CreatureObject) object).getGuildId());
if(object.getGuildId() != 0 && object.getObjectID() == guild.getLeader()){
core.guildService.handleGuildDisband(object, guild);
}
core.objectService.destroyObject(object);
}
@@ -310,11 +335,12 @@ public class LoginService implements INetworkDispatch{
String characterName = resultSet.getString("firstName").replaceAll("\\s",""); ;
String lastName = resultSet.getString("lastName").replaceAll("\\s","");
if (lastName != null && lastName.length() > 0) characterName += " " + lastName;
enumerateCharacterId.addCharacter(
characterName,
resultSet.getInt("appearance"),
resultSet.getLong("Id"),
resultSet.getLong("id"),
resultSet.getInt("galaxyId"),
resultSet.getInt("statusId"));
}