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

temp commit including tempoary account reservation.

Browse Source 
db dump needs testing.
This commit is contained in:
darkk1138
2013-11-24 11:05:41 +01:00
parent 38374b496c
commit d3ff1188d8
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/CharacterService.java
+25 -12
View File
@@ -86,6 +86,8 @@ public class CharacterService implements INetworkDispatch {
swgOpcodes.put(Opcodes.ClientRandomNameRequest, new INetworkRemoteEvent() {
public void handlePacket(IoSession session, IoBuffer data) throws Exception {
Client client = core.getClient((Integer) session.getAttribute("connectionId"));
ClientRandomNameRequest randomNameRequest = new ClientRandomNameRequest();
ClientRandomNameResponse response;
String name = null;
@@ -102,7 +104,7 @@ public class CharacterService implements INetworkDispatch {
}
try {
if (checkForDuplicateName(getfirstName(name, randomNameRequest.getSharedRaceTemplate()))) {
if (checkForDuplicateName(getfirstName(name, randomNameRequest.getSharedRaceTemplate()), client.getAccountId())) {
name = null;
}
} catch (SQLException e2) {
@@ -120,6 +122,8 @@ public class CharacterService implements INetworkDispatch {
@Override
public void handlePacket(IoSession session, IoBuffer data) throws Exception {
Client client = core.getClient((Integer) session.getAttribute("connectionId"));
data = data.order(ByteOrder.LITTLE_ENDIAN);
data.position(0);
ClientVerifyAndLockNameRequest message = new ClientVerifyAndLockNameRequest();
@@ -132,7 +136,7 @@ public class CharacterService implements INetworkDispatch {
int length = firstName.length();
try {
if (checkForDuplicateName(firstName)) {
if (checkForDuplicateName(firstName, client.getAccountId())) {
approved_flag = "name_declined_in_use";
isDeclined = true;
@@ -192,17 +196,16 @@ public class CharacterService implements INetworkDispatch {
}
int galaxyId = config.getInt("GALAXY_ID");
Client client = core.getClient((Integer) session.getAttribute("connectionId"));
try {
if (checkForDuplicateName(getfirstName(clientCreateCharacter.getName(), clientCreateCharacter.getRaceTemplate()))) {
if (checkForDuplicateName(getfirstName(clientCreateCharacter.getName(), clientCreateCharacter.getRaceTemplate()), client.getAccountId())) {
return;
}
} catch (SQLException e2) {
e2.printStackTrace();
}
Client client = core.getClient((Integer) session.getAttribute("connectionId"));
// TODO: Add starting location and items in a script
String raceTemplate = clientCreateCharacter.getRaceTemplate();
// should set to some planet and starting location
@@ -308,19 +311,29 @@ public class CharacterService implements INetworkDispatch {
}
private boolean checkForDuplicateName(String firstName) throws SQLException
private boolean checkForDuplicateName(String firstName, long accountId) throws SQLException
{
firstName = firstName.replace("'", "''");
firstName = firstName.toLowerCase();
PreparedStatement ps = databaseConnection.preparedStatement("SELECT id FROM characters WHERE LOWER(\"firstName\") ='" + firstName + "'");
PreparedStatement ps = databaseConnection.preparedStatement("SELECT id FROM characters WHERE LOWER(\"firstName\")=?");
ps.setString(1, firstName);
ResultSet resultSet = ps.executeQuery();
boolean bool = resultSet.next();
boolean isDuplicate = resultSet.next();
resultSet.getStatement().close();
return bool;
}
//FIXME: this is a bit lazy... but it's only temporary :p
PreparedStatement ps2 = databaseConnection.preparedStatement("SELECT id FROM temp_reserved_char_names WHERE \"accountId\"!=? AND LOWER(\"firstName\")=?");
ps2.setLong(1, accountId);
ps2.setString(2, firstName);
ResultSet resultSet2 = ps2.executeQuery();
boolean isReserved = resultSet.next();
resultSet2.getStatement().close();
return isDuplicate && isReserved;
}
private String getfirstName(String Name, String RaceTemplate)
{
String[] splitName;