diff options
author | GunfighterJ <joseph.jenniges@gmail.com> | 2013-02-09 16:27:19 -0600 |
---|---|---|
committer | GunfighterJ <joseph.jenniges@gmail.com> | 2013-02-09 16:27:19 -0600 |
commit | 8af3733971e25008512fe249c79c7eb27d9c5606 (patch) | |
tree | 92d9a7635bf7d22e77bd1bea7f4515fc41fd6fae | |
parent | 6c6f8208d7b580aa7a4f114b2dd31cf14f4255a6 (diff) | |
parent | 3abb849bfecb3ebde557ab4900d63323112d8db9 (diff) | |
download | Essentials-8af3733971e25008512fe249c79c7eb27d9c5606.tar Essentials-8af3733971e25008512fe249c79c7eb27d9c5606.tar.gz Essentials-8af3733971e25008512fe249c79c7eb27d9c5606.tar.lz Essentials-8af3733971e25008512fe249c79c7eb27d9c5606.tar.xz Essentials-8af3733971e25008512fe249c79c7eb27d9c5606.zip |
Merge branch '2.9' of https://github.com/essentials/Essentials into 2.9
5 files changed, 33 insertions, 23 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()))); } diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index 409be971c..bbf1517cb 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -206,9 +206,9 @@ 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 +# For more information, visit http://wiki.ess3.net/wiki/Kits kits: tools: delay: 10 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 +}
|