From 3245ce10aca65e1126905afd6a9586e9196379dc Mon Sep 17 00:00:00 2001
From: Ali Moghnieh <supaham@supaham.com>
Date: Fri, 22 Jul 2016 20:51:47 +0100
Subject: [PATCH] Prevent multiple tpa requests in a row. Resolves #59

---
 .../src/com/earth2me/essentials/commands/Commandtpa.java    | 6 ++++++
 .../com/earth2me/essentials/commands/Commandtpahere.java    | 5 +++++
 Essentials/src/messages.properties                          | 1 +
 Essentials/src/messages_cs.properties                       | 1 +
 Essentials/src/messages_da.properties                       | 1 +
 Essentials/src/messages_de.properties                       | 1 +
 Essentials/src/messages_en.properties                       | 1 +
 Essentials/src/messages_es.properties                       | 1 +
 Essentials/src/messages_et.properties                       | 1 +
 Essentials/src/messages_fi.properties                       | 1 +
 Essentials/src/messages_fr.properties                       | 1 +
 Essentials/src/messages_hu.properties                       | 1 +
 Essentials/src/messages_it.properties                       | 1 +
 Essentials/src/messages_ko.properties                       | 1 +
 Essentials/src/messages_lt.properties                       | 1 +
 Essentials/src/messages_nl.properties                       | 1 +
 Essentials/src/messages_pl.properties                       | 1 +
 Essentials/src/messages_pt.properties                       | 1 +
 Essentials/src/messages_pt_BR.properties                    | 1 +
 Essentials/src/messages_ro.properties                       | 1 +
 Essentials/src/messages_ru.properties                       | 1 +
 Essentials/src/messages_sv.properties                       | 1 +
 Essentials/src/messages_tr.properties                       | 1 +
 Essentials/src/messages_zh.properties                       | 1 +
 Essentials/src/messages_zh_HK.properties                    | 1 +
 Essentials/src/messages_zh_TW.properties                    | 1 +
 26 files changed, 35 insertions(+)

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java
index 9dbb27998..cb70586ce 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java
@@ -27,6 +27,12 @@ public class Commandtpa extends EssentialsCommand {
         if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + player.getWorld().getName())) {
             throw new Exception(tl("noPerm", "essentials.worlds." + player.getWorld().getName()));
         }
+        // Don't let sender request teleport twice to the same player.
+        if (user.getConfigUUID().equals(player.getTeleportRequest())
+            && player.isTpRequestHere() == false) { // Make sure the last teleport request was actually tpa and not tpahere
+            throw new Exception(tl("requestSentAlready", player.getDisplayName()));
+        }
+
         if (!player.isIgnoredPlayer(user)) {
             player.requestTeleport(user, false);
             player.sendMessage(tl("teleportRequest", user.getDisplayName()));
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java
index 6ca44f170..ac431947d 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java
@@ -27,6 +27,11 @@ public class Commandtpahere extends EssentialsCommand {
         if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + user.getWorld().getName())) {
             throw new Exception(tl("noPerm", "essentials.worlds." + user.getWorld().getName()));
         }
+        // Don't let sender request teleport twice to the same player.
+        if (user.getConfigUUID().equals(player.getTeleportRequest())
+            && player.isTpRequestHere() == true) { // Make sure the last teleport request was actually tpahere and not tpa
+            throw new Exception(tl("requestSentAlready", player.getDisplayName()));
+        }
         if (!player.isIgnoredPlayer(user)) {
             player.requestTeleport(user, true);
             player.sendMessage(tl("teleportHereRequest", user.getDisplayName()));
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index dcd4f21e9..919b3599d 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -379,6 +379,7 @@ requestAcceptedFrom=\u00a7c{0} \u00a76accepted your teleport request.
 requestDenied=\u00a76Teleport request denied.
 requestDeniedFrom=\u00a7c{0} \u00a76denied your teleport request.
 requestSent=\u00a76Request sent to\u00a7c {0}\u00a76.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74Teleport request has timed out.
 requiredBukkit=\u00a76* \! * You need at least build {0} of CraftBukkit, download it from http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Balance has been reset to \u00a7c{0} \u00a76for all online players.
diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties
index 9d2329666..ec538abdb 100644
--- a/Essentials/src/messages_cs.properties
+++ b/Essentials/src/messages_cs.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a77{0} prijal tvou zadost o teleport.
 requestDenied=\u00a77Zadost o teleport zamitnuta.
 requestDeniedFrom=\u00a77{0} odmitl tvou zadost o teleport.
 requestSent=\u00a77Zadost odeslana hraci {0}\u00a77.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a7cZadost o teleportaci vyprsela.
 requiredBukkit=* \! * Potrebujete minimalne verzi {0} Bukkitu, stahnete si ji z http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Hotovost vsech online hracu byla resetovana na \u00a7c{0}\u00a76.
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index 68f37a30e..83fc758d3 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a7c{0} \u00a76accepterede din teleporteringsanmodning.
 requestDenied=\u00a76Teleporterings-anmodning fejlede.
 requestDeniedFrom=\u00a7c{0} \u00a76afviste din teleporteringsanmodning.
 requestSent=\u00a76Anmodning sendt til\u00a7c {0}\u00a76.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74Teleporteringsanmoding udl\u00f8b.
 requiredBukkit=\u00a76* \! * Du skal minimum bruge build {0} af CraftBukkit. Download det fra http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Saldo er blevet nulstillet til \u00a7c{0} \u00a76for alle online spillere.
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index 865cbffa8..41e04335a 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -379,6 +379,7 @@ requestAcceptedFrom=\u00a7c{0} \u00a76hat deine Teleportierungsanfrage angenomme
 requestDenied=\u00a76Teleportierungsanfrage verweigert.
 requestDeniedFrom=\u00a7c{0} \u00a76hat deine Teleportierungsanfrage abgelehnt.
 requestSent=\u00a76Anfrage gesendet an\u00a7c {0}\u00a76.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74Teleportierungsanfrage ist abgelaufen.
 requiredBukkit=\u00a76* \! * Du brauchst mindestens CraftBukkit Build \#{0}, lade es von http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Kontostand aller Spieler auf dem Server auf \u00a7a{0} \u00a76gesetzt.
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 5106008c6..3ac1faa05 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -378,6 +378,7 @@ requestAcceptedFrom=\u00a7c{0} \u00a76accepted your teleport request.
 requestDenied=\u00a76Teleport request denied.
 requestDeniedFrom=\u00a7c{0} \u00a76denied your teleport request.
 requestSent=\u00a76Request sent to\u00a7c {0}\u00a76.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74Teleport request has timed out.
 requiredBukkit=\u00a76* \! * You need at least build {0} of CraftBukkit, download it from http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Balance has been reset to \u00a7c{0} \u00a76for all online players.
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index 9e091585d..8651c145f 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a7c{0} \u00a76ha aceptado tu teletransportaci\u00f3n.
 requestDenied=\u00a76Petici\u00f3n de teletransporte denegada.
 requestDeniedFrom=\u00a7c{0} \u00a76ha denegado tu teletransportaci\u00f3n.
 requestSent=\u00a76La petici\u00f3n ha sido enviada a\u00a7c {0}\u00a76.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74El tiempo de la solicitud de teletransporte se ha agotado.
 requiredBukkit=\u00a75* \! * \u00a7cNecesitas al menos el build {0} de CraftBukkit, descargalo desde \u00a7bhttp\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Dinero reestablecido a \u00a7c{0} \u00a76a todos los jugadores conectados.
diff --git a/Essentials/src/messages_et.properties b/Essentials/src/messages_et.properties
index c37c60cde..406ac82c7 100644
--- a/Essentials/src/messages_et.properties
+++ b/Essentials/src/messages_et.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a7c{0} \u00a76v\u00f5ttis teie teleport kutse vastu.
 requestDenied=\u00a76Teleport kutse h\u00fcljatud.
 requestDeniedFrom=\u00a7c{0} \u00a76h\u00fclgas teie teleport kutse.
 requestSent=\u00a76Kutse saadetud m\u00e4ngijale\u00a7c {0}\u00a76.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74Teleport kutse aegus.
 requiredBukkit=\u00a76* \! * Teil on vaja v\u00e4hemalt build {0} CraftBukkit''it, laadige see alla aadressilt http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Raha on taastatud summaks \u00a7c{0} \u00a76k\u00f5ikidel online m\u00e4ngijatel.
diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties
index 896d2d32c..64d030665 100644
--- a/Essentials/src/messages_fi.properties
+++ b/Essentials/src/messages_fi.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a77{0} hyv\u00e4ksyi sinun teleportti pyynn\u00f6n.
 requestDenied=\u00a77Teleporttaus pyynt\u00f6 kielletty.
 requestDeniedFrom=\u00a77{0} kielt\u00e4ytyi sinun teleportti pyynn\u00f6st\u00e4.
 requestSent=\u00a77Pyynt\u00f6 l\u00e4hetetty pelaajalle {0}\u00a77.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a7cTeleportti pyynt\u00f6 aikakatkaistiin
 requiredBukkit=* \! * Tarvitset v\u00e4hint\u00e4\u00e4n {0} version CraftBukkitista, lataa se osoitteesta http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Balance has been reset to \u00a7c{0} \u00a76for all online players.
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 4561480e4..6f53b8b7c 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -378,6 +378,7 @@ requestAcceptedFrom=\u00a77{0} a accept\u00e9 votre demande de t\u00e9l\u00e9por
 requestDenied=\u00a77Demande de t\u00e9l\u00e9portation refus\u00e9e.
 requestDeniedFrom=\u00a77{0} a refus\u00e9 votre demande de t\u00e9l\u00e9portation.
 requestSent=\u00a77Requ\u00eate envoy\u00e9e \u00e0 {0}\u00a77.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a7cLa demande de t\u00e9l\u00e9portation a expir\u00e9.
 requiredBukkit=* \! * Vous avez au moins besoin de la version {0} de CraftBukkit. T\u00e9l\u00e9chargez-la ici http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Le solde a \u00e9t\u00e9 r\u00e9initialis\u00e9 \u00e0 \u00a7c{0} \u00a76pour tous les joueurs en ligne.
diff --git a/Essentials/src/messages_hu.properties b/Essentials/src/messages_hu.properties
index e97b4ad6f..0b0953e81 100644
--- a/Essentials/src/messages_hu.properties
+++ b/Essentials/src/messages_hu.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a7c{0} \u00a76elfogadta a k\u00e9relmed.
 requestDenied=\u00a76Teleport\u00e1l\u00e1si k\u00e9relem elutas\u00edtva.
 requestDeniedFrom=\u00a7c{0} \u00a76elutas\u00edtotta a k\u00e9relmed.
 requestSent=\u00a76K\u00e9r\u00e9s elk\u00fcldve\u00a7c {0}\u00a76-nak/nek.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74Teleport k\u00e9relem kifutott az id\u00f5b\u00f5l.
 requiredBukkit=\u00a76* \! * You need atleast build {0} of CraftBukkit, download it from http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Egyenleg vissza \u00e1ll\u00edtva \u00a7a{0}-ra/re \u00a76minden fentl\u00e9v\u0151 j\u00e1t\u00e9kosnak.
diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties
index 63323f064..fe0a204e3 100644
--- a/Essentials/src/messages_it.properties
+++ b/Essentials/src/messages_it.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a7c{0} \u00a76ha accettato la tua richiesta di teletrasp
 requestDenied=\u00a76Richiesta di teletrasporto rifiutata.
 requestDeniedFrom=\u00a7c{0} \u00a76Ha rifiutato la tua richiesta di teletrasporto.
 requestSent=\u00a76Richiesta inviata a\u00a7c {0}\u00a76.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74Richiesta di telestrasporto scaduta.
 requiredBukkit=\u00a76* \! * E'' necessaria come minimo la versione {0} di CraftBukkit, scaricala da http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Il bilancio \u00e8 stato resettato a \u00a7c{0} \u00a76per tutti i giocatori in gioco.
diff --git a/Essentials/src/messages_ko.properties b/Essentials/src/messages_ko.properties
index 29b7e34d6..6ab5f7457 100644
--- a/Essentials/src/messages_ko.properties
+++ b/Essentials/src/messages_ko.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a7c{0} \u00a76 \ud154\ub808\ud3ec\ud2b8 \uc694\uccad\uc7
 requestDenied=\u00a76\uc21c\uac04\uc774\ub3d9 \uc694\uccad\uc774 \uac70\ubd80\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
 requestDeniedFrom=\u00a7c{0} \u00a76 \ud154\ub808\ud3ec\ud2b8 \uc694\uccad\uc774 \uac70\ubd80\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
 requestSent=\u00a7c{0}\u00a76\ub2d8\uc5d0\uac8c \ud154\ub808\ud3ec\ud2b8 \uc694\uccad\uc744 \ubcf4\ub0c5\ub2c8\ub2e4.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74\ud154\ub808\ud3ec\ud2b8 \uc694\uccad\uc774 \ud0c0\uc784\uc544\uc6c3 \ub418\uc5c8\uc2b5\ub2c8\ub2e4.
 requiredBukkit=\u00a76* \! * {0} \ubc84\uc804 \uc774\uc0c1\uc758 CraftBukkit\uc744 \uc0ac\uc6a9\ud574\uc57c\ud569\ub2c8\ub2e4. \ub2e4\uc74c \uc8fc\uc18c\uc5d0\uc11c \ub2e4\uc6b4\ub85c\ub4dc \ubc1b\uc73c\uc138\uc694. http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76\ubaa8\ub4e0 \uc628\ub77c\uc778 \ud50c\ub808\uc774\uc5b4\uc758 \uc794\uace0\uac00 \u00a7a{0} \u00a76(\uc73c)\ub85c \ub9ac\uc14b\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
diff --git a/Essentials/src/messages_lt.properties b/Essentials/src/messages_lt.properties
index f3d54f5ed..929b33c86 100644
--- a/Essentials/src/messages_lt.properties
+++ b/Essentials/src/messages_lt.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a7c{0} \u00a76priem\u0117 tavo teleportacijos pra\u0161y
 requestDenied=\u00a76Teleportacijos pra\u0161ymas atmestas.
 requestDeniedFrom=\u00a7c{0} \u00a76atmete tavo teleportacijos prasyma.
 requestSent=\u00a76Pra\u0161ymas nusi\u0173stas\u00a7c {0}\u00a76.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74Teleportacijos pra\u0161ymas anuliuotas.
 requiredBukkit=\u00a76* \! * You need atleast build {0} of CraftBukkit, download it from http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Balansas buvo nustatytas \u012f \u00a7c{0} \u00a76visiems prisijungusiems \u017eaid\u0117jams.
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index 1556d9343..40a1e1beb 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a7c{0} \u00a76accepteerde uw teleportatie aanvraag.
 requestDenied=\u00a77Teleporteer aanvraag geweigerd.
 requestDeniedFrom=\u00a7c{0} \u00a76heeft uw teleportatie aanvraag geweigerd.
 requestSent=\u00a77Aanvraag verstuurd naar {0}\u00a77.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a7cTeleportatie verzoek is verlopen.
 requiredBukkit=\u00a76* \! * U heeft op zijn minst build {0} van CraftBukkit nodig, download het vanaf http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Balans is gereset naar \u00a7c{0} \u00a76voor alle online spelers.
diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties
index 1853a0993..c309330d8 100644
--- a/Essentials/src/messages_pl.properties
+++ b/Essentials/src/messages_pl.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a7c{0} \u00a77zaakceptowal Twoja prosbe o teleportacje.
 requestDenied=\u00a77Prosba o teleportacje - odrzucona.
 requestDeniedFrom=\u00a7c{0} \u00a77odrzucil Twoja prosbe o teleportacje.
 requestSent=\u00a77Twoja prosba o teleportacje zostala wyslana do\u00a7c {0}\u00a77.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a77Prosba o teleportacje - przedawniona.
 requiredBukkit=* \! * Potrzebujesz najnowszego {0} CraftBukkit-a, pobierz go z http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Saldo zosta\u0142o zresetowane na \u00a7a{0} \u00a76dla wszystkich graczy b\u0119d\u0105cych online.
diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties
index 244447ec0..61a447d93 100644
--- a/Essentials/src/messages_pt.properties
+++ b/Essentials/src/messages_pt.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00A7c{0} \u00A76aceitou o teu pedido de teletransporte.
 requestDenied=\u00A76Pedido de teletransporte recusado.
 requestDeniedFrom=\u00A7c{0} \u00A76recusou o teu pedido de teletransporte.
 requestSent=\u00A76Pedido enviado para\u00A7c {0}\u00A76.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00A74Tempo limite do pedido de teletransporte atingido.
 requiredBukkit=\u00A76* ! * Precisas de pelo menos a vers\u00E3o {0} do CraftBukkit, baixa-a em http://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00A76Os saldos de todos os jogadores online foram resetados para \u00A7a{0}\u00A76.
diff --git a/Essentials/src/messages_pt_BR.properties b/Essentials/src/messages_pt_BR.properties
index 624d62602..55a62f08c 100644
--- a/Essentials/src/messages_pt_BR.properties
+++ b/Essentials/src/messages_pt_BR.properties
@@ -377,6 +377,7 @@ requestacceptedFrom=\u00A7c{0} \u00A76aceitou seu pedido de teleporte.
 requestDenied=\u00A76Pedido de teleporte negado.
 requestDeniedFrom=\u00A7c{0} \u00A76negou seu pedido de teleporte.
 requestSent=\u00A76Pedido enviado para\u00A7c {0}\u00A76.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00A74Temp limite do pedido de teleporte se esgotou.
 requiredBukkit=\u00A76* \! * Voc\uuea precisa de pelo menos a vers\u00E3o{0} do CraftBukkit, baixe-a em http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00A76Saldos de todos os jogadores online resetados para \u00A7a{0}\u00A76.
diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties
index f210681e0..1dac02d4b 100644
--- a/Essentials/src/messages_ro.properties
+++ b/Essentials/src/messages_ro.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a7c{0} \u00a76a acceptat cererea de teleportare.
 requestDenied=\u00a76Cererea de teleportare a fost respinsa.
 requestDeniedFrom=\u00a7c{0} \u00a76a respins cererea de teleportare.
 requestSent=\u00a76Cerere a fost trimisa catre\u00a7c {0}\u00a76.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74Timpul de acceptare s-a terminat.
 requiredBukkit=\u00a76*[\!]* Ai nevoie de constructia minima {0} ale Bukkit-ului, descarcal de pe http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Balance has been reset to \u00a7c{0} \u00a76for all online players.
diff --git a/Essentials/src/messages_ru.properties b/Essentials/src/messages_ru.properties
index c55e12c88..0e31b0413 100644
--- a/Essentials/src/messages_ru.properties
+++ b/Essentials/src/messages_ru.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a7c{0} \u00a76\u043f\u0440\u0438\u043d\u044f\u043b \u041
 requestDenied=\u00a76\u0417\u0430\u043f\u0440\u043e\u0441 \u043d\u0430 \u0442\u0435\u043b\u0435\u043f\u043e\u0440\u0442\u0430\u0446\u0438\u044e \u0431\u044b\u043b \u043e\u0442\u043a\u043b\u043e\u043d\u0435\u043d.
 requestDeniedFrom=\u00a7c{0} \u00a76\u043e\u0442\u043a\u043b\u043e\u043d\u0438\u043b \u0412\u0430\u0448 \u0437\u0430\u043f\u0440\u043e\u0441 \u043d\u0430 \u0442\u0435\u043b\u0435\u043f\u043e\u0440\u0442\u0430\u0446\u0438\u044e.
 requestSent=\u00a76\u0417\u0430\u043f\u0440\u043e\u0441 \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d \u0438\u0433\u0440\u043e\u043a\u0443\u00a7c {0}\u00a76.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74\u0412\u0440\u0435\u043c\u044f \u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u043d\u0430 \u0442\u0435\u043b\u0435\u043f\u043e\u0440\u0442\u0430\u0446\u0438\u044e \u0432\u044b\u0448\u043b\u043e.
 requiredBukkit=\u00a76* \! * \u0422\u044b \u0434\u043e\u043b\u0436\u0435\u043d \u0438\u043c\u0435\u0442\u044c {0} \u0431\u0438\u043b\u0434 CraftBukkit, \u0441\u043a\u0430\u0447\u0430\u0442\u044c \u0435\u0433\u043e \u043c\u043e\u0436\u043d\u043e \u0442\u0443\u0442 http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76\u0411\u0430\u043b\u0430\u043d\u0441 \u0431\u044b\u043b \u0441\u0431\u0440\u043e\u0448\u0435\u043d \u043d\u0430 \u00a7a{0} \u00a76\u0434\u043b\u044f \u0438\u0433\u0440\u043e\u043a\u043e\u0432 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435.
diff --git a/Essentials/src/messages_sv.properties b/Essentials/src/messages_sv.properties
index 60dd077d7..2006dc82e 100644
--- a/Essentials/src/messages_sv.properties
+++ b/Essentials/src/messages_sv.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a77{0} accepterade din teleportations-f\u00f6rfr\u00e5ga
 requestDenied=\u00a77Teleportations-f\u00f6rfr\u00e5gan nekad.
 requestDeniedFrom=\u00a77{0} nekade din teleportations-f\u00f6rfr\u00e5gan.
 requestSent=\u00a77F\u00f6rfr\u00e5gan skickad till {0}\u00a77.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a7cTeleportations-f\u00f6rfr\u00e5gan har g\u00e5tt ut
 requiredBukkit=* \! * Du beh\u00f6ver minst bygge {0} av CraftBukkit, ladda ner den fr\u00e5n http\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76Balance has been reset to \u00a7c{0} \u00a76for all online players.
diff --git a/Essentials/src/messages_tr.properties b/Essentials/src/messages_tr.properties
index daae60417..6959244d1 100644
--- a/Essentials/src/messages_tr.properties
+++ b/Essentials/src/messages_tr.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a7c{0} \u00a76Isinlanma Istegini Kabul Etti.
 requestDenied=\u00a76Isinlanma Istegi Rededildi
 requestDeniedFrom=\u00a7c{0} \u00a76Istegini Redetti\!
 requestSent=\u00a76Isinlanma Istegi Gonderildi.
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74Isinlanma Istegi Zaman Asimina Ugradi\!
 requiredBukkit=\u00a76* \! * CraftBukkitiniz Plugin Ile Uyusmuyor Lutfen Son Surumu Yukleyin.
 resetBal=\u00a76Bakiyeler Resetlendi \u00a7a{0} \u00a76Tum Online Oyuncular Icin.
diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties
index 965b3d82b..29e059fdd 100644
--- a/Essentials/src/messages_zh.properties
+++ b/Essentials/src/messages_zh.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a7c{0}\u00a76 \u63a5\u53d7\u4e86\u4f60\u7684\u4f20\u9001
 requestDenied=\u00a76\u5df2\u62d2\u7edd\u4f20\u9001\u8bf7\u6c42
 requestDeniedFrom=\u00a7c{0}\u00a76 \u62d2\u7edd\u4e86\u4f60\u7684\u4f20\u9001\u8bf7\u6c42
 requestSent=\u00a76\u8bf7\u6c42\u5df2\u53d1\u9001\u7ed9 {0}\u00a76
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74\u4f20\u9001\u8bf7\u6c42\u8d85\u65f6\u2026\u2026
 requiredBukkit=\u00a76* \! * \u4f60\u81f3\u5c11\u9700\u8981\u7248\u672c {0} \u4ee5\u4e0a\u7684CraftBukkit.\u8bf7\u81f3\u5b98\u7f51\u4e0b\u8f7dhttp\://dl.bukkit.org/downloads/craftbukkit/
 resetBal=\u00a76\u6240\u6709\u5728\u7ebf\u73a9\u5bb6\u7684\u91d1\u94b1\u5df2\u91cd\u7f6e\u4e3a \u00a7c{0} \u00a76.
diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties
index cd3066a3f..1337194bf 100644
--- a/Essentials/src/messages_zh_HK.properties
+++ b/Essentials/src/messages_zh_HK.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a7c{0}\u00a76 \u63a5\u53d7\u4e86\u4f60\u7684\u50b3\u9001
 requestDenied=\u00a76\u5df2\u62d2\u7d55\u50b3\u9001\u8acb\u6c42
 requestDeniedFrom=\u00a7c{0}\u00a76 \u62d2\u7d55\u4e86\u4f60\u7684\u50b3\u9001\u8acb\u6c42
 requestSent=\u00a76\u8acb\u6c42\u5df2\u767c\u9001\u7d66 {0}\u00a76
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74\u50b3\u9001\u8acb\u6c42\u8d85\u6642\u2026\u2026
 requiredBukkit=\u00a76\u4f60\u9700\u8981\u7248\u672c {0} \u4ee5\u4e0a\u7684bukkit.\u8acb\u81f3\u5b98\u7db2\u4e0b\u8f09
 resetBal=\u00a76\u6240\u6709\u5728\u7dda\u73a9\u5bb6\u7684\u8ca1\u7522\u5df2\u7d93\u91cd\u7f6e\u70ba \u00a7c{0} \u00a76\u3002
diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties
index 9820089bd..3bd6b7b52 100644
--- a/Essentials/src/messages_zh_TW.properties
+++ b/Essentials/src/messages_zh_TW.properties
@@ -377,6 +377,7 @@ requestAcceptedFrom=\u00a7c{0}\u00a76 \u63a5\u53d7\u4e86\u4f60\u7684\u50b3\u9001
 requestDenied=\u00a76\u5df2\u62d2\u7d55\u50b3\u9001\u8acb\u6c42
 requestDeniedFrom=\u00a7c{0}\u00a76 \u62d2\u7d55\u4e86\u4f60\u7684\u50b3\u9001\u8acb\u6c42
 requestSent=\u00a76\u8acb\u6c42\u5df2\u767c\u9001\u7d66 {0}\u00a76
+requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
 requestTimedOut=\u00a74\u50b3\u9001\u8acb\u6c42\u8d85\u6642\u2026\u2026
 requiredBukkit=\u00a76\u4f60\u9700\u8981\u7248\u672c {0} \u4ee5\u4e0a\u7684bukkit.\u8acb\u81f3\u5b98\u7db2\u4e0b\u8f09
 resetBal=\u00a76\u6240\u6709\u5728\u7dda\u73a9\u5bb6\u7684\u8ca1\u7522\u5df2\u7d93\u91cd\u7f6e\u70ba \u00a7c{0} \u00a76\u3002