From 977176de863417a7f23ad1739c1a7a0fc138d7a7 Mon Sep 17 00:00:00 2001 From: Minenash Date: Wed, 9 Jan 2019 17:41:15 -0500 Subject: Fixed `/tp player1 player2` --- src/main/java/com/redstoner/modules/survival/Survival.java | 4 +++- src/main/java/com/redstoner/modules/teleport/Teleport.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/redstoner/modules/survival/Survival.java b/src/main/java/com/redstoner/modules/survival/Survival.java index a743b2b..97b7b9a 100644 --- a/src/main/java/com/redstoner/modules/survival/Survival.java +++ b/src/main/java/com/redstoner/modules/survival/Survival.java @@ -19,6 +19,8 @@ import com.redstoner.misc.Main; import com.redstoner.modules.Module; import com.redstoner.modules.datamanager.DataManager; +import net.md_5.bungee.api.ChatMessageType; +import net.md_5.bungee.api.chat.TextComponent; import net.nemez.chatapi.ChatAPI; @Commands(CommandHolderType.File) @@ -93,6 +95,6 @@ public class Survival implements Module, Listener { public void notifyPlayers(List players, String msg) { for (Player p : players) - ChatAPI.sendActionBar(p, "&0[&2Sleep&0] " + msg); + p.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(ChatAPI.colorify(null, "&0[&2Sleep&0] " + msg))); } } diff --git a/src/main/java/com/redstoner/modules/teleport/Teleport.java b/src/main/java/com/redstoner/modules/teleport/Teleport.java index 77f2f11..c9d1d55 100644 --- a/src/main/java/com/redstoner/modules/teleport/Teleport.java +++ b/src/main/java/com/redstoner/modules/teleport/Teleport.java @@ -89,14 +89,14 @@ public class Teleport implements Module, Listener } Player p1 = Bukkit.getPlayer(player); - Player p2 = Bukkit.getPlayer(player); + Player p2 = Bukkit.getPlayer(player2); if (p1 == null) playerDoesNotExistError(sender, player); else if (p2 == null) playerDoesNotExistError(sender, player2); else if (p1.getName().equals(p2.getName())) - cannotTpToYourself(sender); + getLogger().message(sender, true, "You can't teleport a player to themselves."); else { p1.teleport(p2, TeleportCause.COMMAND); getLogger().message(sender, "&e" +p1.getDisplayName() + "&7 has been teleported to &e" + -- cgit v1.2.3