diff --git a/src/main/java/cn/nukkit/command/defaults/BanCommand.java b/src/main/java/cn/nukkit/command/defaults/BanCommand.java
index ca437e55712..33282b8c4c4 100644
--- a/src/main/java/cn/nukkit/command/defaults/BanCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/BanCommand.java
@@ -37,7 +37,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
             return false;
         }
 
-        String name = args[0];
+        String name = args[0].replace("@s", sender.getName());
         StringBuilder reason = new StringBuilder();
         for (int i = 1; i < args.length; i++) {
             reason.append(args[i]).append(" ");
diff --git a/src/main/java/cn/nukkit/command/defaults/DeopCommand.java b/src/main/java/cn/nukkit/command/defaults/DeopCommand.java
index 4934da84e69..08ba7b58c16 100644
--- a/src/main/java/cn/nukkit/command/defaults/DeopCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/DeopCommand.java
@@ -34,7 +34,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
             return false;
         }
 
-        String playerName = args[0];
+        String playerName = args[0].replace("@s", sender.getName());
         IPlayer player = sender.getServer().getOfflinePlayer(playerName);
         player.setOp(false);
 
diff --git a/src/main/java/cn/nukkit/command/defaults/EffectCommand.java b/src/main/java/cn/nukkit/command/defaults/EffectCommand.java
index 760db564e36..d60f51d49a2 100644
--- a/src/main/java/cn/nukkit/command/defaults/EffectCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/EffectCommand.java
@@ -56,7 +56,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
             sender.sendMessage(new TranslationContainer("commands.generic.usage", this.usageMessage));
             return true;
         }
-        Player player = sender.getServer().getPlayer(args[0]);
+        Player player = sender.getServer().getPlayer(args[0].replace("@s", sender.getName()));
         if (player == null) {
             sender.sendMessage(new TranslationContainer(TextFormat.RED + "%commands.generic.player.notFound"));
             return true;
diff --git a/src/main/java/cn/nukkit/command/defaults/EnchantCommand.java b/src/main/java/cn/nukkit/command/defaults/EnchantCommand.java
index 169df2638c0..77228636b95 100644
--- a/src/main/java/cn/nukkit/command/defaults/EnchantCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/EnchantCommand.java
@@ -46,7 +46,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
             sender.sendMessage(new TranslationContainer("commands.generic.usage", this.usageMessage));
             return true;
         }
-        Player player = sender.getServer().getPlayer(args[0]);
+        Player player = sender.getServer().getPlayer(args[0].replace("@s", sender.getName()));
         if (player == null) {
             sender.sendMessage(new TranslationContainer(TextFormat.RED + "%commands.generic.player.notFound"));
             return true;
diff --git a/src/main/java/cn/nukkit/command/defaults/GamemodeCommand.java b/src/main/java/cn/nukkit/command/defaults/GamemodeCommand.java
index 3f07ae5b1a1..ef43d0476fb 100644
--- a/src/main/java/cn/nukkit/command/defaults/GamemodeCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/GamemodeCommand.java
@@ -51,7 +51,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
         CommandSender target = sender;
         if (args.length > 1) {
             if (sender.hasPermission("nukkit.command.gamemode.other")) {
-                target = sender.getServer().getPlayer(args[1]);
+                target = sender.getServer().getPlayer(args[1].replace("@s", sender.getName()));
                 if (target == null) {
                     sender.sendMessage(new TranslationContainer(TextFormat.RED + "%commands.generic.player.notFound"));
                     return true;
diff --git a/src/main/java/cn/nukkit/command/defaults/GiveCommand.java b/src/main/java/cn/nukkit/command/defaults/GiveCommand.java
index d3cef0469d9..ebd6be62641 100644
--- a/src/main/java/cn/nukkit/command/defaults/GiveCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/GiveCommand.java
@@ -51,7 +51,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
             return true;
         }
 
-        Player player = sender.getServer().getPlayer(args[0]);
+        Player player = sender.getServer().getPlayer(args[0].replace("@s", sender.getName()));
         Item item;
 
         try {
diff --git a/src/main/java/cn/nukkit/command/defaults/KickCommand.java b/src/main/java/cn/nukkit/command/defaults/KickCommand.java
index 1caf85ac982..a73db169b5d 100644
--- a/src/main/java/cn/nukkit/command/defaults/KickCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/KickCommand.java
@@ -35,7 +35,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
             return false;
         }
 
-        String name = args[0];
+        String name = args[0].replace("@s", sender.getName());
 
         StringBuilder reason = new StringBuilder();
         for (int i = 1; i < args.length; i++) {
diff --git a/src/main/java/cn/nukkit/command/defaults/KillCommand.java b/src/main/java/cn/nukkit/command/defaults/KillCommand.java
index fcb84d2c710..e51262dcec1 100644
--- a/src/main/java/cn/nukkit/command/defaults/KillCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/KillCommand.java
@@ -45,7 +45,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
                 sender.sendMessage(new TranslationContainer(TextFormat.RED + "%commands.generic.permission"));
                 return true;
             }
-            Player player = sender.getServer().getPlayer(args[0]);
+            Player player = sender.getServer().getPlayer(args[0].replace("@s", sender.getName()));
             if (player != null) {
                 if (player.isCreative() || player.isSpectator()) {
                     sender.sendMessage(TextFormat.RED + "No targets matched selector");
diff --git a/src/main/java/cn/nukkit/command/defaults/SpawnpointCommand.java b/src/main/java/cn/nukkit/command/defaults/SpawnpointCommand.java
index bf10543d072..1afd5d68e3d 100644
--- a/src/main/java/cn/nukkit/command/defaults/SpawnpointCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/SpawnpointCommand.java
@@ -41,7 +41,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
                 return true;
             }
         } else {
-            target = sender.getServer().getPlayer(args[0]);
+            target = sender.getServer().getPlayer(args[0].replace("@s", sender.getName()));
             if (target == null) {
                 sender.sendMessage(new TranslationContainer(TextFormat.RED + "%commands.generic.player.notFound"));
                 return true;
diff --git a/src/main/java/cn/nukkit/command/defaults/TellCommand.java b/src/main/java/cn/nukkit/command/defaults/TellCommand.java
index 37dc1426bd7..58cf3004cf4 100644
--- a/src/main/java/cn/nukkit/command/defaults/TellCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/TellCommand.java
@@ -37,7 +37,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
             return false;
         }
 
-        String name = args[0].toLowerCase();
+        String name = args[0].replace("@s", sender.getName());
 
         Player player = sender.getServer().getPlayer(name);
         if (player == null) {
diff --git a/src/main/java/cn/nukkit/command/defaults/TitleCommand.java b/src/main/java/cn/nukkit/command/defaults/TitleCommand.java
index 2bdf150c741..b7be1a97d31 100644
--- a/src/main/java/cn/nukkit/command/defaults/TitleCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/TitleCommand.java
@@ -50,7 +50,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
             return false;
         }
 
-        Player player = Server.getInstance().getPlayerExact(args[0]);
+        Player player = Server.getInstance().getPlayerExact(args[0].replace("@s", sender.getName()));
         if (player == null) {
             sender.sendMessage(new TranslationContainer(TextFormat.RED + "%commands.generic.player.notFound"));
             return true;
diff --git a/src/main/java/cn/nukkit/command/defaults/XpCommand.java b/src/main/java/cn/nukkit/command/defaults/XpCommand.java
index 26a5a5f9323..9ca01f11b92 100644
--- a/src/main/java/cn/nukkit/command/defaults/XpCommand.java
+++ b/src/main/java/cn/nukkit/command/defaults/XpCommand.java
@@ -52,7 +52,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
                 player = (Player) sender;
             } else if (args.length == 2) {
                 amountString = args[0];
-                playerName = args[1];
+                playerName = args[1].replace("@s", sender.getName());
                 player = sender.getServer().getPlayer(playerName);
             } else {
                 sender.sendMessage(new TranslationContainer("commands.generic.usage", this.usageMessage));