From 1f99b455a0129d234a95e3767307e165b89ed8f9 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Fri, 1 Feb 2013 14:14:46 +0200 Subject: [PATCH 1/8] Derp - revert incorrect modified line --- .../src/org/anjocaido/groupmanager/GroupManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index 4bac6d2ef..da978b9cc 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -407,7 +407,7 @@ public class GroupManager extends JavaPlugin { 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; } From a21492e592143e4d7a97d4d4ba49dc0e5334c6b8 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Fri, 1 Feb 2013 16:31:58 +0200 Subject: [PATCH 2/8] Update EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java --- .../anjocaido/groupmanager/dataholder/UsersDataHolder.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java index 5f14a7d45..033857bd8 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 +} From 8a665ab520cd7466bbdca76e6c8ceb8a1e5163b2 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Fri, 1 Feb 2013 16:33:37 +0200 Subject: [PATCH 3/8] Update EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/GroupsDataHolder.java --- .../groupmanager/dataholder/GroupsDataHolder.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 +} From 665c229329e90b37f0d2877df524f87c8644de03 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Fri, 1 Feb 2013 16:33:55 +0200 Subject: [PATCH 4/8] Update EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java --- .../anjocaido/groupmanager/dataholder/UsersDataHolder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java index 033857bd8..ee822f1af 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java @@ -53,7 +53,7 @@ public class UsersDataHolder { public WorldDataHolder getDataSource() { - return this.dataSource + return this.dataSource; } /** @@ -111,4 +111,4 @@ public class UsersDataHolder { this.timeStampUsers = timeStampUsers; } -} +} From e03a6880406c7a3a07a572ea610030a21827e58f Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Fri, 1 Feb 2013 16:39:18 +0200 Subject: [PATCH 5/8] Update EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java --- .../src/org/anjocaido/groupmanager/GroupManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index 4bac6d2ef..6e1fec657 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -1975,8 +1975,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().getDataSource.getName()); + sender.sendMessage(ChatColor.YELLOW + "Users:" + ChatColor.GREEN + " " + dataHolder.getUsersFile().getDataSource.getName()); return true; From d94b5dbe33425fa724f42de9984c9a7127b571c7 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Mon, 4 Feb 2013 13:33:06 +0000 Subject: [PATCH 6/8] Fix Necrodooms errors for not using an IDE!!!!! --- .../src/org/anjocaido/groupmanager/GroupManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index b9eebe7e7..10f437a6c 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -407,7 +407,7 @@ public class GroupManager extends JavaPlugin { senderPlayer = (Player) sender; if (!lastError.isEmpty() && !commandLabel.equalsIgnoreCase("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'."); + 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 +1975,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:" + ChatColor.GREEN + " " + dataHolder.getGroupsFile().getDataSource.getName()); - sender.sendMessage(ChatColor.YELLOW + "Users:" + ChatColor.GREEN + " " + dataHolder.getUsersFile().getDataSource.getName()); + sender.sendMessage(ChatColor.YELLOW + "Groups:" + ChatColor.GREEN + " " + dataHolder.getGroupsObject().getDataSource().getName()); + sender.sendMessage(ChatColor.YELLOW + "Users:" + ChatColor.GREEN + " " + dataHolder.getUsersObject().getDataSource().getName()); return true; From c46c086388b8c52f9dd973d1ea442479227fe6d3 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Mon, 4 Feb 2013 13:44:58 +0000 Subject: [PATCH 7/8] Revert Necro's change to mancheckw --- .../src/org/anjocaido/groupmanager/GroupManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index 10f437a6c..74778f495 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -1975,8 +1975,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:" + ChatColor.GREEN + " " + dataHolder.getGroupsObject().getDataSource().getName()); - sender.sendMessage(ChatColor.YELLOW + "Users:" + ChatColor.GREEN + " " + dataHolder.getUsersObject().getDataSource().getName()); + sender.sendMessage(ChatColor.YELLOW + "Groups:" + ChatColor.GREEN + " " + dataHolder.getGroupsFile().getAbsolutePath()); + sender.sendMessage(ChatColor.YELLOW + "Users:" + ChatColor.GREEN + " " + dataHolder.getUsersFile().getAbsolutePath()); return true; From de258e26da7b043602dfae269715f42d8eff123c Mon Sep 17 00:00:00 2001 From: ElgarL Date: Sat, 9 Feb 2013 10:51:16 +0000 Subject: [PATCH 8/8] Fix bad Git Merge --- .../src/org/anjocaido/groupmanager/GroupManager.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index 74778f495..14006bf75 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -397,11 +397,6 @@ 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;