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

Merge branch 'experimental'

Browse Source 
Conflicts:
	src/services/command/CommandService.java

merge conflict
This commit is contained in:
Zing
2014-09-01 22:35:38 -07:00
parent 24da9f9f07 882cba71cd
commit 47719ea5ad
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/command/CommandService.java
+2 -1
View File
@@ -693,7 +693,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") || command.getCommandName().equals("server") || command.getCommandName().equals("teleport")
|| command.getCommandName().equals("teleportto") || command.getCommandName().equals("teleporttarget") || command.getCommandName().equals("createcreature") || command.getCommandName().equals("giveitem") ) {
|| command.getCommandName().equals("teleportto") || command.getCommandName().equals("teleporttarget") || command.getCommandName().equals("createcreature") || command.getCommandName().equals("giveitem") ) {
String accessLevel = core.adminService.getAccessLevelFromDB(actor.getClient().getAccountId());
String filePath = "accesslevels/" + accessLevel + ".txt";
System.out.println(command.getCommandName() + " was just used by an admin with accessLevel: " + accessLevel + ".");