summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src/org/anjocaido
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
commit14e836e2043828d49e0b28ed4f78ec82880c6422 (patch)
treed14886d574115a57aa56715f7cb20780a6d5dba5 /EssentialsGroupManager/src/org/anjocaido
parentd4c844ceddb8fc4222c376aaf6ec28a2c7346c45 (diff)
downloadEssentials-14e836e2043828d49e0b28ed4f78ec82880c6422.tar
Essentials-14e836e2043828d49e0b28ed4f78ec82880c6422.tar.gz
Essentials-14e836e2043828d49e0b28ed4f78ec82880c6422.tar.lz
Essentials-14e836e2043828d49e0b28ed4f78ec82880c6422.tar.xz
Essentials-14e836e2043828d49e0b28ed4f78ec82880c6422.zip
Fix bad Git Merge
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido')
-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;