Merge remote-tracking branch 'GitHub/master'

src/cn/citycraft/SimpleEssential/SimpleEssential.java

@@ -10,6 +10,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -49,6 +50,8 @@ public class SimpleEssential extends JavaPlugin {
 				if (!command.hasPermission(sender)) {
 					sender.sendMessage(ChatColor.RED + "你没有此命令的权限.");
 					return true;
+				}else if(command.isOnlyPlayerExecutable() && !(sender instanceof Player)){
+					sender.sendMessage(ChatColor.RED + "此命令只能由玩家执行.");
 				}
 				if (args.length >= command.getMinimumArguments()) {
 					try {

src/cn/citycraft/SimpleEssential/command/CommandBack.java

@@ -23,6 +23,9 @@ public class CommandBack extends SimpleEssentialCommand {
 		this.plugin = main;
 	}
 	
+	@Override
+	public boolean isOnlyPlayerExecutable() {return true;};
+
 	@Override
 	public void execute(CommandSender sender, String label, String[] args) throws CommandException {
 		plugin.tpcontrol.back((Player) sender);

src/cn/citycraft/SimpleEssential/command/CommandHome.java

@@ -25,6 +25,9 @@ public class CommandHome extends SimpleEssentialCommand {
 		this.plugin = main;
 	}
 	
+	@Override
+	public boolean isOnlyPlayerExecutable() {return true;};
+
 	@Override
 	public void execute(CommandSender sender, String label, String[] args) throws CommandException {
 		Player p = (Player) sender;

src/cn/citycraft/SimpleEssential/command/CommandSetHome.java

@@ -26,6 +26,9 @@ public class CommandSetHome extends SimpleEssentialCommand {
 		this.plugin = main;
 	}
 	
+	@Override
+	public boolean isOnlyPlayerExecutable() {return true;};
+
 	@Override
 	public void execute(CommandSender sender, String label, String[] args) throws CommandException {
 		Player p = (Player) sender;

src/cn/citycraft/SimpleEssential/command/CommandTop.java

@@ -27,6 +27,9 @@ public class CommandTop extends SimpleEssentialCommand {
 		this.plugin = main;
 	}
 	
+	@Override
+	public boolean isOnlyPlayerExecutable() {return true;};
+
 	@Override
 	public String getPossibleArguments() {
 		return "";

src/cn/citycraft/SimpleEssential/command/CommandTpa.java

@@ -28,6 +28,9 @@ public class CommandTpa extends SimpleEssentialCommand {
 		this.plugin = main;
 	}
 	
+	@Override
+	public boolean isOnlyPlayerExecutable() {return true;};
+
 	@Override
 	public String getPossibleArguments() {
 		return "<目标玩家>";

src/cn/citycraft/SimpleEssential/command/CommandTpaccept.java

@@ -25,6 +25,9 @@ public class CommandTpaccept extends SimpleEssentialCommand {
 		this.plugin = main;
 	}
 	
+	@Override
+	public boolean isOnlyPlayerExecutable() {return true;};
+
 	@Override
 	public String getPossibleArguments() {
 		return "";

src/cn/citycraft/SimpleEssential/command/CommandTpdeny.java

@@ -25,6 +25,9 @@ public class CommandTpdeny extends SimpleEssentialCommand {
 		this.plugin = main;
 	}
 	
+	@Override
+	public boolean isOnlyPlayerExecutable() {return true;};
+
 	@Override
 	public String getPossibleArguments() {
 		return "";

src/cn/citycraft/SimpleEssential/command/CommandTphere.java

@@ -39,6 +39,9 @@ public class CommandTphere extends SimpleEssentialCommand {
 		});
 	}
 	
+	@Override
+	public boolean isOnlyPlayerExecutable() {return true;};
+
 	@Override
 	public int getMinimumArguments() {
 		return 1;

src/cn/citycraft/SimpleEssential/command/SimpleEssentialCommand.java

@@ -94,6 +94,11 @@ public abstract class SimpleEssentialCommand {
 	 */
 	public abstract void execute(CommandSender sender, String label, String[] args) throws CommandException;
 	
+	/**
+	 * 是否只有玩家才能执行此命令
+	 */
+	public abstract boolean isOnlyPlayerExecutable();
+
 	/**
 	 * 命令匹配检测
 	 * 

src/plugin.yml

@@ -57,6 +57,12 @@ commands:
     usage: §b使用/sethome 设置当前位置为家!
     permission: se.sethome
     permission-message: §c你没有 <permission> 的权限来执行此命令!
+  suicide: 
+    description: 自杀
+    aliases: [sesuicide,sd]
+    usage: §b使用/suicide结束自己的生命!
+    permission: se.suicide
+    permission-message: §c你没有 <permission> 的权限来执行此命令!
 permissions: 
   se.*:
     description: 简单基础插件所有权限!
@@ -72,4 +78,5 @@ permissions:
       se.tpaccept: true
       se.tpdeny: true
       se.back: true
+      se.suicide: true