Merge remote-tracking branch 'origin/master' into Fixes

This commit is contained in:
CharonInferar
2014-08-16 21:41:55 +02:00
13 changed files with 261 additions and 172 deletions
+2 -1
View File
@@ -690,7 +690,8 @@ public class CommandService implements INetworkDispatch {
public void processCommand(CreatureObject actor, SWGObject target, BaseSWGCommand command, int actionCounter, String commandArgs) {
if (command.getGodLevel() > 0 || command.getCommandName().equals("setgodmode")) {
if (command.getGodLevel() > 0 || command.getCommandName().equals("setgodmode") || command.getCommandName().equals("server") || command.getCommandName().equals("teleport")
|| command.getCommandName().equals("teleportto") || command.getCommandName().equals("teleporttarget") ) {
String accessLevel = core.adminService.getAccessLevelFromDB(actor.getClient().getAccountId());
String filePath = "accesslevels/" + accessLevel + ".txt";