From 844be04d75842ac408ed47e197da0a07254d9738 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Fri, 1 Feb 2013 14:14:46 +0200 Subject: [PATCH 01/11] 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 971902ae3893c18887ce58f8d291afb6b4888a08 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Fri, 1 Feb 2013 16:31:58 +0200 Subject: [PATCH 02/11] 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 d40484d016fb810d2200f5d76f51cbcb3efb6a01 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Fri, 1 Feb 2013 16:33:37 +0200 Subject: [PATCH 03/11] 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 7ec65bf2130de3b8445081dbcf57fae9ed396b88 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Fri, 1 Feb 2013 16:33:55 +0200 Subject: [PATCH 04/11] 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 fae5780e095398f5c8c20b1f6073252aa2f4b949 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Fri, 1 Feb 2013 16:39:18 +0200 Subject: [PATCH 05/11] 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 b1bc73f93808c7c63e31f2ccb966d6d473ccb1a3 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Mon, 4 Feb 2013 13:33:06 +0000 Subject: [PATCH 06/11] 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 6506c290c82b8787034559e23230606ac49b49c8 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Mon, 4 Feb 2013 13:44:58 +0000 Subject: [PATCH 07/11] 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 80ad075f0232e17208f2e8748fdb85dc6e040ccb Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Sat, 9 Feb 2013 11:57:32 +0200 Subject: [PATCH 08/11] fix itemmeta link on kit section --- Essentials/src/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index 409be971c..db875ec44 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -206,7 +206,7 @@ player-commands: # Note: All items MUST be followed by a quantity! # All kit names should be lower case, and will be treated as lower in permissions/costs. # Syntax: - itemID[:DataValue/Durability] Amount [Enchantment:Level].. [itemmeta:value]... -# For Item meta information visit http://wiki.ess3.net/wiki/Command_Reference/ICheat#itemmeta +# For Item meta information visit http://wiki.ess3.net/wiki/Item_Meta # 'delay' refers to the cooldown between how often you can use each kit, measured in seconds. # For more information, visit http://wiki.ess3.net/wiki/Command_Reference/ICheat#kits kits: From d30c3ca2a6882da4d7f696794269081546ec4813 Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Sat, 9 Feb 2013 12:47:36 +0200 Subject: [PATCH 09/11] update kit link to the new one --- Essentials/src/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index db875ec44..bbf1517cb 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -208,7 +208,7 @@ player-commands: # Syntax: - itemID[:DataValue/Durability] Amount [Enchantment:Level].. [itemmeta:value]... # For Item meta information visit http://wiki.ess3.net/wiki/Item_Meta # 'delay' refers to the cooldown between how often you can use each kit, measured in seconds. -# For more information, visit http://wiki.ess3.net/wiki/Command_Reference/ICheat#kits +# For more information, visit http://wiki.ess3.net/wiki/Kits kits: tools: delay: 10 From 1f932434c21ccfc02034fd1c658dd87d1a826c4d Mon Sep 17 00:00:00 2001 From: ElgarL Date: Sat, 9 Feb 2013 10:51:16 +0000 Subject: [PATCH 10/11] 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; From d522a4230f45c0cfb2e52e061d9815f45de89040 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 9 Feb 2013 19:31:31 +0000 Subject: [PATCH 11/11] Make /god and /god behave the same. --- .../essentials/commands/Commandgod.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java b/Essentials/src/com/earth2me/essentials/commands/Commandgod.java index 2e27fa192..571003c73 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandgod.java @@ -33,10 +33,20 @@ public class Commandgod extends EssentialsCommand godOtherPlayers(server, user, args); return; } - user.setGodModeEnabled(!user.isGodModeEnabled()); + godPlayer(user, !user.isGodModeEnabled()); user.sendMessage(_("godMode", (user.isGodModeEnabled() ? _("enabled") : _("disabled")))); } + private void godPlayer(User player, boolean enabled) + { + player.setGodModeEnabled(enabled); + if (enabled) + { + player.setHealth(player.getMaxHealth()); + player.setFoodLevel(20); + } + } + private void godOtherPlayers(final Server server, final CommandSender sender, final String[] args) { for (Player matchPlayer : server.matchPlayer(args[0])) @@ -47,29 +57,24 @@ public class Commandgod extends EssentialsCommand continue; } + boolean enabled; if (args.length > 1) { if (args[1].contains("on") || args[1].contains("ena") || args[1].equalsIgnoreCase("1")) { - player.setGodModeEnabled(true); + enabled = true; } else { - player.setGodModeEnabled(false); + enabled = false; } } else { - player.setGodModeEnabled(!player.isGodModeEnabled()); - } - - final boolean enabled = player.isGodModeEnabled(); - if (enabled) - { - player.setHealth(player.getMaxHealth()); - player.setFoodLevel(20); + enabled = !player.isGodModeEnabled(); } + godPlayer(player, enabled); player.sendMessage(_("godMode", (enabled ? _("enabled") : _("disabled")))); sender.sendMessage(_("godMode", _(enabled ? "godEnabledFor" : "godDisabledFor", matchPlayer.getDisplayName()))); }