projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-01-17 00:06:00 -05:00
Code Issues Projects Releases Wiki Activity

Added reserved words to ZoneService

Browse Source
This commit is contained in:
Obique
2015-01-23 13:55:14 -06:00
committed by Obique
parent d4c4e72826
commit d4f52329ff
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
namegen/reserved_words.txt
View File

@@ -0,0 +1,11 @@
undercova
obique
waverunner
ilikenwf
nergmada
skorpios
telsia
tacef
pyron rydex
carnor
stryker

12
src/services/player/ZoneService.java
View File

@@ -3,7 +3,6 @@ package services.player;
import intents.GalacticIntent;
import intents.PlayerEventIntent;
import java.io.File;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.Calendar;
@@ -41,6 +40,7 @@ import resources.control.Service;
import resources.objects.creature.CreatureObject;
import resources.objects.player.PlayerObject;
import resources.objects.tangible.TangibleObject;
import resources.player.AccessLevel;
import resources.player.Player;
import resources.player.PlayerEvent;
import resources.services.Config;
@@ -61,7 +61,7 @@ public class ZoneService extends Service {
public ZoneService() {
nameGenerator = new SWGNameGenerator();
clientFac = new ClientFactory();
nameFilter = new NameFilter(new File("namegen/bad_word_list.txt"));
nameFilter = new NameFilter("namegen/bad_word_list.txt", "namegen/reserved_words.txt");
}
@Override
@@ -115,7 +115,7 @@ public class ZoneService extends Service {
private void handleApproveNameRequest(PlayerManager playerMgr, Player player, ClientVerifyAndLockNameRequest request) {
String name = request.getName();
ErrorMessage err = getNameValidity(name);
ErrorMessage err = getNameValidity(name, player.getAccessLevel() != AccessLevel.PLAYER);
if (err == ErrorMessage.NAME_APPROVED_MODIFIED)
name = nameFilter.cleanName(name);
sendPacket(player.getNetworkId(), new ClientVerifyAndLockNameResponse(name, err));
@@ -125,7 +125,7 @@ public class ZoneService extends Service {
System.out.println("ZoneService: Create Character: " + create.getName() + " User: " + player.getUsername() + " IP: " + create.getAddress() + ":" + create.getPort());
long characterId = createCharacter(objManager, player, create);
ErrorMessage err = getNameValidity(create.getName());
ErrorMessage err = getNameValidity(create.getName(), player.getAccessLevel() != AccessLevel.PLAYER);
if (err == ErrorMessage.NAME_APPROVED && createCharacterInDb(characterId, create.getName(), player)) {
sendPacket(player, new CreateCharacterSuccess(characterId));
new PlayerEventIntent(player, PlayerEvent.PE_CREATE_CHARACTER).broadcast();
@@ -161,7 +161,7 @@ public class ZoneService extends Service {
}
}
private ErrorMessage getNameValidity(String name) {
private ErrorMessage getNameValidity(String name, boolean admin) {
String modified = nameFilter.cleanName(name);
if (nameFilter.isEmpty(modified)) // Empty name
return ErrorMessage.NAME_DECLINED_EMPTY;
@@ -171,6 +171,8 @@ public class ZoneService extends Service {
return ErrorMessage.NAME_DECLINED_PROFANE;
if (nameFilter.isFictionallyInappropriate(modified))
return ErrorMessage.NAME_DECLINED_FICTIONALLY_INAPPROPRIATE;
if (nameFilter.isReserved(modified) && !admin)
return ErrorMessage.NAME_DECLINED_RESERVED;
if (characterExistsForName(modified)) // User already exists
return ErrorMessage.NAME_DECLINED_IN_USE;
if (!modified.equals(name)) // If we needed to remove double spaces, trim the ends, etc