diff --git a/src/main/java/org/ultramine/commands/basic/BasicCommands.java b/src/main/java/org/ultramine/commands/basic/BasicCommands.java index 0bef496..a0ddcdc 100644 --- a/src/main/java/org/ultramine/commands/basic/BasicCommands.java +++ b/src/main/java/org/ultramine/commands/basic/BasicCommands.java @@ -217,6 +217,18 @@ } @Command( + name = "tphere", + group = "player", + permissions = {"command.player.tphere"}, + syntax = {""} + ) + public static void tphere(CommandContext ctx) + { + Teleporter.tpNow(ctx.get("target").asPlayer(), ctx.getSenderAsPlayer()); + ctx.sendMessage("command.tp.success.player", ctx.get("target").asPlayer().func_145748_c_(), ctx.getSenderAsPlayer().func_145748_c_()); + } + + @Command( name = "setspawn", group = "admin", permissions = {"command.admin.setspawn"}, diff --git a/src/main/java/org/ultramine/commands/basic/VanillaCommands.java b/src/main/java/org/ultramine/commands/basic/VanillaCommands.java index 33050c5..a92e9f5 100644 --- a/src/main/java/org/ultramine/commands/basic/VanillaCommands.java +++ b/src/main/java/org/ultramine/commands/basic/VanillaCommands.java @@ -98,7 +98,7 @@ { EntityPlayerMP dst = context.get("dst").asPlayer(); Teleporter.tpNow(target, dst); - context.sendMessage("command.tp.success.player", target.getCommandSenderName(), dst.getCommandSenderName()); + context.sendMessage("command.tp.success.player", target.func_145748_c_(), dst.func_145748_c_()); } else if(context.contains("x") && context.contains("y") && context.contains("z")) { @@ -108,7 +108,7 @@ double z = context.get("z").asCoordinate(target.posZ); Teleporter.tpNow(target, world.provider.dimensionId, x, y, z); context.sendMessage("command.tp.success.coordinate", - target.getCommandSenderName(), world.getWorldInfo().getWorldName(), x, y, z); + target.func_145748_c_(), world.getWorldInfo().getWorldName(), x, y, z); } } diff --git a/src/main/resources/assets/ultramine/lang/en_US.lang b/src/main/resources/assets/ultramine/lang/en_US.lang index 257b231..a77f7f7 100644 --- a/src/main/resources/assets/ultramine/lang/en_US.lang +++ b/src/main/resources/assets/ultramine/lang/en_US.lang @@ -23,10 +23,13 @@ #Vanilla replacements command.tp.usage=/tp [target player] OR /tp [target player] [world] -command.tp.description=Teleport target player (or you) to another player or coordinate +command.tp.description=Teleports target player (or you) to another player or coordinate command.tp.success.player=Teleported <%s> to <%s> command.tp.success.coordinate=Teleported <%s> to <%s, %s, %s, %s> +command.tphere.usage=/tphere [target player] +command.tphere.description=Teleports target player to you + command.difficulty.usage=/difficulty [world] command.difficulty.description=Changes difficulty setting of selected world command.difficulty.success=Difficulty of world %s changed from %s to %s diff --git a/src/main/resources/assets/ultramine/lang/ru_RU.lang b/src/main/resources/assets/ultramine/lang/ru_RU.lang index 24f8dff..6ac7404 100644 --- a/src/main/resources/assets/ultramine/lang/ru_RU.lang +++ b/src/main/resources/assets/ultramine/lang/ru_RU.lang @@ -27,6 +27,9 @@ command.tp.success.player=Телепортирован '%s' к '%s' command.tp.success.coordinate=Телепортирован '%s' к [%s](%s, %s, %s) +command.tphere.usage=/tphere [кого] +command.tphere.description=Телепортация указанного игрока к вам + command.difficulty.usage=/difficulty [мир] command.difficulty.description=Изменение сложности игры command.difficulty.success=Сложность мира %s изменена с %s на %s