Merge pull request #306 from Riaku/master

per-group permissions attempt#2

Essentials/src/config.yml

@@ -290,6 +290,9 @@ no-god-in-worlds:
 # This does not affect the /home command, there is a separate toggle below for this.
 world-teleport-permissions: false
 
+#Set to true to enable per-group teleporting permissions.
+per-group-teleport: false
+
 # The number of items given if the quantity parameter is left out in /item or /give.
 # If this number is below 1, the maximum stack size size is given. If over-sized stacks
 # are not enabled, any number higher than the maximum stack size results in more than one stack.

Essentials/src/net/ess3/commands/Commandtp.java

@@ -27,6 +27,11 @@ public class Commandtp extends EssentialsCommand
 			{
 				throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName()));
 			}
+			if (settings.getData().getGeneral().isPerGroupTeleport() && !Permissions.PERGROUPTELEPORT.isAuthorized(
+					user, ess.getRanks().getMainGroup(player)))
+			{
+				throw new Exception(_("noPerm", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
+			}
 			if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() && !Permissions.WORLD.isAuthorized(
 					user, player.getPlayer().getWorld().getName()))
 			{

Essentials/src/net/ess3/commands/Commandtpa.java

@@ -22,8 +22,12 @@ public class Commandtpa extends EssentialsCommand
 		{
 			throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName()));
 		}
-
 		ISettings settings = ess.getSettings();
+		if (settings.getData().getGeneral().isPerGroupTeleport() && !Permissions.PERGROUPTELEPORT.isAuthorized(
+					user, ess.getRanks().getMainGroup(player)))
+			{
+				throw new Exception(_("noPerm", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
+			}
 		if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && ess.getSettings().getData().getGeneral().isWorldTeleportPermissions() && !Permissions.WORLD.isAuthorized(
 				user, user.getPlayer().getWorld().getName()))
 		{

Essentials/src/net/ess3/commands/Commandtpahere.java

@@ -24,6 +24,11 @@ public class Commandtpahere extends EssentialsCommand
 		}
 
 		ISettings settings = ess.getSettings();
+		if (settings.getData().getGeneral().isPerGroupTeleport() && !Permissions.PERGROUPTELEPORT.isAuthorized(
+					user, ess.getRanks().getMainGroup(player)))
+			{
+				throw new Exception(_("noPerm", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
+			}
 		if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() && !Permissions.WORLD.isAuthorized(
 				user, user.getPlayer().getWorld().getName()))
 		{

Essentials/src/net/ess3/commands/Commandtpall.java

@@ -27,7 +27,7 @@ public class Commandtpall extends EssentialsCommand
 		final IUser player = ess.getUserMap().matchUserExcludingHidden(args[0], getPlayerOrNull(sender));
 		teleportAllPlayers(sender, player);
 	}
-
+	
 	private void teleportAllPlayers(CommandSender sender, IUser user)
 	{
 		sender.sendMessage(_("teleportAll"));

Essentials/src/net/ess3/commands/Commandtphere.java

@@ -1,8 +1,10 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
+import net.ess3.permissions.Permissions;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
@@ -16,6 +18,12 @@ public class Commandtphere extends EssentialsCommand
 		{
 			throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName()));
 		}
+		ISettings settings = ess.getSettings();
+		if (settings.getData().getGeneral().isPerGroupTeleport() && !Permissions.PERGROUPTELEPORT.isAuthorized(
+					user, ess.getRanks().getMainGroup(player)))
+			{
+				throw new Exception(_("noPerm", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
+			}
 
 		user.getTeleport().teleportToMe(player, new Trade(commandName, ess), TeleportCause.COMMAND);
 		user.sendMessage(_("teleporting"));

Essentials/src/net/ess3/commands/Commandtpo.java

@@ -1,6 +1,7 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -19,6 +20,12 @@ public class Commandtpo extends EssentialsCommand
 		//Just basically the old tp command
 		final IUser player = ess.getUserMap().matchUser(args[0], false);
 
+		ISettings settings = ess.getSettings();
+		if (settings.getData().getGeneral().isPerGroupTeleport() && !Permissions.PERGROUPTELEPORT.isAuthorized(
+					user, ess.getRanks().getMainGroup(player)))
+			{
+				throw new Exception(_("noPerm", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
+			}
 		// Verify permission
 		if (user.getPlayer().canSee(player.getPlayer()) || Permissions.TELEPORT_HIDDEN.isAuthorized(user))
 		{

Essentials/src/net/ess3/commands/Commandtpohere.java

@@ -27,6 +27,11 @@ public class Commandtpohere extends EssentialsCommand
 		{
 			throw new Exception(_("noPerm", "essentials.world." + user.getPlayer().getWorld().getName()));
 		}
+		if (settings.getData().getGeneral().isPerGroupTeleport() && !Permissions.PERGROUPTELEPORT.isAuthorized(
+					user, ess.getRanks().getMainGroup(player)))
+			{
+				throw new Exception(_("noPerm", "essentials.teleport.groups." + ess.getRanks().getMainGroup(player)));
+			}
 
 
 		// Verify permission

Essentials/src/net/ess3/permissions/Permissions.java

@@ -167,6 +167,7 @@ public enum Permissions implements IPermission
 	}
 
 	public static DotStarPermission ENCHANT = new DotStarPermission("essentials.enchant");
+	public static DotStarPermission PERGROUPTELEPORT = new DotStarPermission("essentials.teleport.groups");
 	public static MaterialDotStarPermission GIVE = new MaterialDotStarPermission("essentials.give", PermissionDefault.TRUE);
 	public static DotStarPermission RANKS = new DotStarPermission("essentials.ranks");
 	public static DotStarPermission HELP = new DotStarPermission("essentials.help");

Essentials/src/net/ess3/settings/General.java

@@ -59,6 +59,8 @@ public class General implements StorageObject
 			})
 	private boolean worldTeleportPermissions = false;
 	private boolean worldHomePermissions = false;
+	@Comment("Set to true to enable per-group teleporting permissions.")
+	private boolean perGroupTeleport = false;
 	@Comment("Delay to wait before people can cause attack damage after logging in ")
 	private long loginAttackDelay = 0;
 

EssentialsGroupManager/src/Changelog.txt

@@ -34,10 +34,10 @@ v 1.3:
 	  (for all worlds named in config.yml)
 	- Attempt to stop GM wiping groups/users yml's on a bad shut down.
 	- Added event handling to manage new world creation at runtime.
-	- Added the ability to handle unknown worlds at server start.
+	- Added the ability to handle unknown worlds at server start.
-	  (GM will create the data files for any worlds it finds which are not in the config.yml)
+	  (GM will create the data files for any worlds it finds which are not in the config.yml)
 	- Fix for Bukkit passing a null To location on a player Portaling
-	- Fixed manudelsub not correctly selecting the group to remove.
+	- Fixed manudelsub not correctly selecting the group to remove.
 	- Added two new permission nodes - groupmanager.notify.self & groupmanager.notify.other
 	  These allow players/admins to be notified when players are moved between groups.
 v 1.4: