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
commit1f932434c21ccfc02034fd1c658dd87d1a826c4d (patch)
treeb0497bfa2ad5fb50febcadc789e5c3808ed7ca63 /EssentialsGroupManager
parent6506c290c82b8787034559e23230606ac49b49c8 (diff)
downloadEssentials-1f932434c21ccfc02034fd1c658dd87d1a826c4d.tar
Essentials-1f932434c21ccfc02034fd1c658dd87d1a826c4d.tar.gz
Essentials-1f932434c21ccfc02034fd1c658dd87d1a826c4d.tar.lz
Essentials-1f932434c21ccfc02034fd1c658dd87d1a826c4d.tar.xz
Essentials-1f932434c21ccfc02034fd1c658dd87d1a826c4d.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;