Merge remote-tracking branch 'origin/groupmanager' into 2.9

3 files changed, 15 insertions, 10 deletions

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
index 4bac6d2ef..14006bf75 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
@@ -397,17 +397,12 @@ public class GroupManager extends JavaPlugin {
 		  	return true;
 		}
 
-		if (sender.getClass().getName().equals("org.bukkit.craftbukkit.command.CraftBlockCommandSender")) {
-			sender.sendMessage(ChatColor.RED + "GM Commands can not be called from CommandBlocks");
-			return true;
-		}
-
 		// DETERMINING PLAYER INFORMATION
 		if (sender instanceof Player) {
 			senderPlayer = (Player) sender;
 
 			if (!lastError.isEmpty() && !commandLabel.equalsIgnoreCase("manload")) {
-				GroupManager.logger.warning(ChatColor.RED + "All commands are locked due to an error. " + ChatColor.BOLD + "" + ChatColor.UNDERLINE + "Check the log" + ChatColor.RESET + "" + ChatColor.RED + " and then try a '/manload'.");
+				sender.sendMessage(ChatColor.RED + "All commands are locked due to an error. " + ChatColor.BOLD + "" + ChatColor.UNDERLINE + "Check the log" + ChatColor.RESET + "" + ChatColor.RED + " and then try a '/manload'.");
 				return true;
 			}
 
@@ -1975,8 +1970,8 @@ public class GroupManager extends JavaPlugin {
 				
 				sender.sendMessage(ChatColor.YELLOW + "You have selected world '" + dataHolder.getName() + "'.");
 				sender.sendMessage(ChatColor.YELLOW + "This world is using the following data files..");
-				sender.sendMessage(ChatColor.YELLOW + "Groups: " + dataHolder.getGroupsFile().getAbsolutePath());
-				sender.sendMessage(ChatColor.YELLOW + "Users: " + dataHolder.getUsersFile().getAbsolutePath());
+				sender.sendMessage(ChatColor.YELLOW + "Groups:" + ChatColor.GREEN + " " + dataHolder.getGroupsFile().getAbsolutePath());
+				sender.sendMessage(ChatColor.YELLOW + "Users:" + ChatColor.GREEN + " " + dataHolder.getUsersFile().getAbsolutePath());
 
 				return true;
 
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/GroupsDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/GroupsDataHolder.java
index 418405f65..1ae4d06bc 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/GroupsDataHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/GroupsDataHolder.java
@@ -42,6 +42,11 @@ public class GroupsDataHolder {
 			group.setDataSource(this.dataSource);

 		}

 	}

+	

+	public WorldDataHolder getDataSource() {

+

+		return this.dataSource;

+	}

 

 	/**

 	 * @return the defaultGroup

@@ -123,4 +128,4 @@ public class GroupsDataHolder {
 		this.timeStampGroups = timeStampGroups;

 	}

 

-}
\ No newline at end of file
+}
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java
index 5f14a7d45..ee822f1af 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java
@@ -50,6 +50,11 @@ public class UsersDataHolder {
 

 		return users;

 	}

+	

+	public WorldDataHolder getDataSource() {

+		

+		return this.dataSource;

+	}

 

 	/**

 	 * Resets the Users

@@ -106,4 +111,4 @@ public class UsersDataHolder {
 		this.timeStampUsers = timeStampUsers;

 	}

 

-}
\ No newline at end of file
+}