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

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source
This commit is contained in:
Treeku
2013-12-09 08:45:41 +00:00
parent 09beefe817 64a01d4d88
commit 9453b85477
72 changed files with 1918 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/CharacterService.java
+74 -46
View File
@@ -37,6 +37,7 @@ import engine.clients.Client;
import engine.resources.common.CRC;
import engine.resources.container.CreatureContainerPermissions;
import engine.resources.container.CreaturePermissions;
import engine.resources.container.Traverser;
import engine.resources.database.DatabaseConnection;
import engine.resources.objects.SWGObject;
import engine.resources.scene.Point3D;
@@ -44,7 +45,6 @@ import engine.resources.scene.Quaternion;
import engine.resources.service.INetworkDispatch;
import engine.resources.service.INetworkRemoteEvent;
import resources.common.*;
import protocol.swg.ClientCreateCharacter;
import protocol.swg.ClientMfdStatusUpdateMessage;
import protocol.swg.ClientRandomNameRequest;
@@ -53,8 +53,8 @@ import protocol.swg.ClientVerifyAndLockNameRequest;
import protocol.swg.ClientVerifyAndLockNameResponse;
import protocol.swg.CreateCharacterSuccess;
import protocol.swg.HeartBeatMessage;
import resources.objects.creature.CreatureObject;
import resources.objects.mission.MissionObject;
import resources.objects.player.PlayerObject;
import resources.objects.tangible.TangibleObject;
import resources.objects.weapon.WeaponObject;
@@ -87,6 +87,7 @@ public class CharacterService implements INetworkDispatch {
swgOpcodes.put(Opcodes.ClientRandomNameRequest, new INetworkRemoteEvent() {
public void handlePacket(IoSession session, IoBuffer data) throws Exception {
ClientRandomNameRequest randomNameRequest = new ClientRandomNameRequest();
ClientRandomNameResponse response;
String name = null;
@@ -95,16 +96,23 @@ public class CharacterService implements INetworkDispatch {
data.position(0);
randomNameRequest.deserialize(data);
while (name == null) {
String firstName ="";
String lastName = "";
if (randomNameRequest.getSharedRaceTemplate().contains("wookie")) {
name = nameGenerator.compose(4);
firstName = nameGenerator.compose(4);
} else {
name = nameGenerator.compose(2) + " " + nameGenerator.compose(3);
firstName = nameGenerator.compose(2);
lastName = nameGenerator.compose(3);
}
try {
if (checkForDuplicateName(getfirstName(name, randomNameRequest.getSharedRaceTemplate()))) {
name = null;
//it's fine here to just use 0 as accountId because we don't want reserved names to be random generated for anyone.
if (!checkForDuplicateName(firstName, 0)) {
name = firstName + ((lastName.length() > 0 ) ? " " + lastName : "");
}
} catch (SQLException e2) {
e2.printStackTrace();
@@ -121,6 +129,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();
@@ -129,11 +139,11 @@ public class CharacterService implements INetworkDispatch {
boolean isDeclined = false;
String firstName = getfirstName(message.getName(), message.getRaceTemplate());
String lastName = getlastName(message.getName(), message.getRaceTemplate());
if(message.getName() != null) System.out.println(message.getName());
//if(message.getName() != null) System.out.println(message.getName());
int length = firstName.length();
try {
if (checkForDuplicateName(firstName)) {
if (checkForDuplicateName(firstName, client.getAccountId())) {
approved_flag = "name_declined_in_use";
isDeclined = true;
@@ -193,17 +203,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
@@ -234,10 +243,12 @@ public class CharacterService implements INetworkDispatch {
if (constitution >= 1) core.skillModService.addSkillMod(object, "constitution", (int) constitution);
if (stamina >= 1) core.skillModService.addSkillMod(object, "stamina", (int) stamina);
if (agility >= 1) core.skillModService.addSkillMod(object, "agility", (int) agility);
object.createTransaction(core.getCreatureODB().getEnvironment());
PlayerObject player = (PlayerObject) core.objectService.createObject("object/player/shared_player.iff", object.getPlanet());
object._add(player);
core.skillService.addSkill(object, "species_" + object.getStfName());
player.setProfession(clientCreateCharacter.getProfession());
player.setProfessionWheelPosition(clientCreateCharacter.getProfessionWheelPosition());
if(clientCreateCharacter.getHairObject().length() > 0) {
@@ -264,6 +275,14 @@ public class CharacterService implements INetworkDispatch {
object._add(datapad);
object._add(bank);
object._add(missionBag);
/*for(int missionsAdded = 0; missionsAdded < 12; missionsAdded++) {
MissionObject mission = (MissionObject) core.objectService.createObject("object/mission/shared_mission_object.iff", object.getPlanet());
missionBag._add(mission);
Console.println("Added empty mission " + missionsAdded);
}*/
TangibleObject backpack = (TangibleObject) core.objectService.createObject("object/tangible/wearables/backpack/shared_backpack_galactic_marine.iff", object.getPlanet());
inventory._add(backpack);
//object.addObjectToEquipList(datapad);
@@ -311,63 +330,72 @@ 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);
//System.out.println(ps.toString());
ResultSet resultSet = ps.executeQuery();
boolean bool = resultSet.next();
boolean isDuplicate = resultSet.next();
resultSet.getStatement().close();
return bool;
}
if (isDuplicate) { return true; }
//FIXME: this is a bit lazy... but it's only temporary :p
PreparedStatement psc = databaseConnection.preparedStatement("SELECT * FROM pg_tables WHERE \"tablename\"=?");
psc.setString(1, "temp_reserved_char_names");
ResultSet resultSetC = psc.executeQuery();
boolean tableExists = resultSetC.next();
resultSetC.getStatement().close();
if (!tableExists) { return false; }
PreparedStatement ps2 = databaseConnection.preparedStatement("SELECT \"accountId\" FROM temp_reserved_char_names WHERE \"accountId\"!=? AND LOWER(\"firstName\")=?");
ps2.setLong(1, accountId);
ps2.setString(2, firstName);
ResultSet resultSet2 = ps2.executeQuery();
boolean isReserved = resultSet2.next();
resultSet2.getStatement().close();
return isReserved;
}
private String getfirstName(String Name, String RaceTemplate)
{
String[] splitName;
if (RaceTemplate != "object/creature/player/wookiee_male.iff" | RaceTemplate != "object/creature/player/wookiee_female.iff")
if (RaceTemplate.contains("/wookiee_") ||
!Name.contains(" "))
{ // wookies don't have lastNames
if (Name.contains(" "))
{
splitName = Name.split(" ", 2);
return splitName[0];
}
else
{
return Name;
}
}
else
{
return Name;
}
return Name.split(" ", 2)[0];
}
private String getlastName(String Name, String RaceTemplate)
{
String[] splitName;
if (RaceTemplate != "object/creature/player/wookiee_male.iff" && RaceTemplate != "object/creature/player/wookiee_female.iff")
if (RaceTemplate.contains("/wookiee_") ||
!Name.contains(" "))
{ // wookies don't have lastNames
if (Name.contains(" "))
{
splitName = Name.split(" ", 2);
return splitName[1];
}
else
{
return "";
}
}
else
{
return "";
}
return Name.split(" ", 2)[1];
}
private String checkForReservedName(String firstName, String lastName) throws SQLException
{
PreparedStatement psc = databaseConnection.preparedStatement("SELECT * FROM pg_tables WHERE \"tablename\"=?");
psc.setString(1, "reservednames");
ResultSet rsc = psc.executeQuery();
if (!rsc.next()) {
return null;
}
firstName = firstName.toLowerCase();
lastName = lastName.toLowerCase();