From 0c3a3732be98a622917f51762b116fa10612da03 Mon Sep 17 00:00:00 2001 From: Eric Stokes Date: Sat, 30 Jul 2011 09:27:18 -0600 Subject: [PATCH] Added fancy formatting to force teleport. --- .../com/onarandombox/MultiverseCore/MVTeleport.java | 2 +- .../MultiverseCore/commands/TeleportCommand.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/onarandombox/MultiverseCore/MVTeleport.java b/src/main/java/com/onarandombox/MultiverseCore/MVTeleport.java index 5c9af10e..2a46f8a8 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MVTeleport.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MVTeleport.java @@ -197,7 +197,7 @@ public class MVTeleport { Player p = (Player) e.getPassenger(); p.sendMessage("No safe locations found!"); } - this.plugin.log(Level.WARNING, "Sorry champ, you're(" + e.getEntityId() + ") basically trying to teleport into a minefield. I should just kill you now."); + this.plugin.log(Level.WARNING, "Sorry champ, you're basically trying to teleport into a minefield. I should just kill you now."); return false; } diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java index 26f64179..e8088c51 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java @@ -107,13 +107,17 @@ public class TeleportCommand extends MultiverseCommand { teleporter.sendMessage("Sorry Boss, I tried everything, but just couldn't teleport ya there!"); return; } - if(!this.playerTeleporter.safelyTeleport(teleportee, l)) { + if (!this.playerTeleporter.safelyTeleport(teleportee, l)) { Class paramTypes[] = { Player.class, Location.class }; List items = new ArrayList(); items.add(teleportee); items.add(l); - String message = "Multiverse" + ChatColor.WHITE + " did not teleport you to " + ChatColor.DARK_AQUA + d.getName() + ChatColor.WHITE + " because it was unsafe."; - this.plugin.getCommandHandler().queueCommand(sender, "mvteleport", "teleportPlayer", items, paramTypes, "", "", ChatColor.GREEN + message, "Would you like to try anyway?", 15); + String player = "you"; + if (!teleportee.equals(teleporter)) { + player = teleportee.getName(); + } + String message = ChatColor.GREEN + "Multiverse" + ChatColor.WHITE + " did not teleport " + ChatColor.AQUA + player + ChatColor.WHITE + " to " + ChatColor.DARK_AQUA + d.getName() + ChatColor.WHITE + " because it was unsafe."; + this.plugin.getCommandHandler().queueCommand(sender, "mvteleport", "teleportPlayer", items, paramTypes, message, "Would you like to try anyway?", "", "", 15); } } }