Cleanup

/manuadd command

3 files changed, 28 insertions, 2 deletions

diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuadd.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuadd.java
index 1f41b890a..8515aaea7 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuadd.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/Commandmanuadd.java
@@ -1,6 +1,7 @@
 package com.earth2me.essentials.permissions;
 
 import com.earth2me.essentials.commands.EssentialsCommand;
+import com.earth2me.essentials.commands.NotEnoughArgumentsException;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 
@@ -15,7 +16,13 @@ public class Commandmanuadd extends EssentialsCommand
 	@Override
 	protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
 	{
-		
+		if (args.length < 2)
+		{
+			throw new NotEnoughArgumentsException();
+		}
+		final String player = args[0];
+		final String group = args[1];
+		ess.getServer().dispatchCommand(sender, "/permissions "+player+" parents add "+group+"");
 	}
 	
 	
diff --git a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/EssentialsPermissionsCommands.java b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/EssentialsPermissionsCommands.java
index f8af12f28..e3c3f1dd6 100644
--- a/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/EssentialsPermissionsCommands.java
+++ b/EssentialsPermissionsCommands/src/com/earth2me/essentials/permissions/EssentialsPermissionsCommands.java
@@ -1,16 +1,35 @@
 package com.earth2me.essentials.permissions;
 
 import com.earth2me.essentials.Essentials;
+import com.nijiko.permissions.PermissionHandler;
+import com.nijikokun.bukkit.Permissions.Permissions;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
 
 public class EssentialsPermissionsCommands extends JavaPlugin
 {
+	private static PermissionHandler permissionHandler = null;
+
+	public static PermissionHandler getPermissionHandler()
+	{
+		return permissionHandler;
+	}
+
 	@Override
 	public void onEnable()
 	{
+		final PluginManager pluginManager = getServer().getPluginManager();
+		final Plugin permissionsPlugin = pluginManager.getPlugin("Permissions");
+
+		if (permissionsPlugin != null
+			&& permissionsPlugin.getDescription().getVersion().charAt(0) == '3')
+		{
+			permissionHandler = ((Permissions)permissionsPlugin).getHandler();
+		}
 	}
 
 	@Override
diff --git a/EssentialsPermissionsCommands/src/plugin.yml b/EssentialsPermissionsCommands/src/plugin.yml
index 3d75176a7..54425b716 100644
--- a/EssentialsPermissionsCommands/src/plugin.yml
+++ b/EssentialsPermissionsCommands/src/plugin.yml
@@ -1,5 +1,5 @@
 # This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
-name: Essentials
+name: EssentialsPermissionsCommands
 main: com.earth2me.essentials.permissions.EssentialsPermissionsCommands
 # Note to developers: This next line cannot change, or the automatic versioning system will break.
 version: TeamCity