summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2013-02-09 10:51:16 +0000
committerElgarL <ElgarL@palmergames.com>2013-02-09 10:51:16 +0000
commitde258e26da7b043602dfae269715f42d8eff123c (patch)
tree84c3c6bc6b3240176b9b02f5d62113824b06c2f1 /EssentialsGroupManager
parentc46c086388b8c52f9dd973d1ea442479227fe6d3 (diff)
downloadEssentials-de258e26da7b043602dfae269715f42d8eff123c.tar
Essentials-de258e26da7b043602dfae269715f42d8eff123c.tar.gz
Essentials-de258e26da7b043602dfae269715f42d8eff123c.tar.lz
Essentials-de258e26da7b043602dfae269715f42d8eff123c.tar.xz
Essentials-de258e26da7b043602dfae269715f42d8eff123c.zip
Fix bad Git Merge
Diffstat (limited to 'EssentialsGroupManager')
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java5
1 files changed, 0 insertions, 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;