From c28d749548ed54fb83287c9e7fe9c5a4c78af87f Mon Sep 17 00:00:00 2001 From: Ali Moghnieh Date: Wed, 31 May 2017 03:30:05 +0100 Subject: [PATCH] Create `/tpacancel`. `/tpacancel` allows tp requesters to cancel sent requests before the target client can accept them. This aids in combatting long-lived tp requests in PvP environment. `/tpacancel ` cancels all a tp request sent to only. --- .../essentials/commands/Commandtpa.java | 1 + .../essentials/commands/Commandtpacancel.java | 59 +++++++++++++++++++ .../essentials/commands/Commandtpahere.java | 1 + Essentials/src/messages.properties | 3 + Essentials/src/messages_cs.properties | 3 + Essentials/src/messages_da.properties | 3 + Essentials/src/messages_de.properties | 3 + Essentials/src/messages_en.properties | 3 + Essentials/src/messages_es.properties | 3 + Essentials/src/messages_et.properties | 3 + Essentials/src/messages_fi.properties | 3 + Essentials/src/messages_fr.properties | 3 + Essentials/src/messages_hu.properties | 3 + Essentials/src/messages_it.properties | 3 + Essentials/src/messages_ko.properties | 3 + Essentials/src/messages_lt.properties | 3 + Essentials/src/messages_nl.properties | 3 + Essentials/src/messages_pl.properties | 3 + Essentials/src/messages_pt.properties | 3 + Essentials/src/messages_pt_BR.properties | 3 + Essentials/src/messages_ro.properties | 3 + Essentials/src/messages_ru.properties | 3 + Essentials/src/messages_sv.properties | 3 + Essentials/src/messages_tr.properties | 3 + Essentials/src/messages_zh.properties | 3 + Essentials/src/messages_zh_HK.properties | 3 + Essentials/src/messages_zh_TW.properties | 3 + Essentials/src/plugin.yml | 4 ++ 28 files changed, 137 insertions(+) create mode 100644 Essentials/src/com/earth2me/essentials/commands/Commandtpacancel.java diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java index cd1d575c9..69f5ee54e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpa.java @@ -43,5 +43,6 @@ public class Commandtpa extends EssentialsCommand { } } user.sendMessage(tl("requestSent", player.getDisplayName())); + user.sendMessage(tl("typeTpacancel")); } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpacancel.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpacancel.java new file mode 100644 index 000000000..9c949445e --- /dev/null +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpacancel.java @@ -0,0 +1,59 @@ +package com.earth2me.essentials.commands; + +import static com.earth2me.essentials.I18n.tl; + +import com.earth2me.essentials.I18n; +import com.earth2me.essentials.User; + +import net.ess3.api.IEssentials; + +import org.bukkit.Server; + + +public class Commandtpacancel extends EssentialsCommand { + + public Commandtpacancel() { + super("tpacancel"); + } + + /** + * Cancel {@link User}'s tp request if its {@code requester} is equal to the given {@code requester}. + * @param ess ess instance + * @param user user holding tp request + * @param requester tp requester + * @return whether tp was cancelled + */ + public static boolean cancelTeleportRequest(IEssentials ess, User user, User requester) throws Exception { + if (user.getTeleportRequest() != null) { + User userRequester = ess.getUser(user.getTeleportRequest()); + if (requester.equals(userRequester)) { + user.requestTeleport(null, false); + return true; + } + } + return false; + } + + @Override + public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { + if (args.length == 0) { + int cancellations = 0; + for (User onlineUser : ess.getOnlineUsers()) { + if (onlineUser == user) continue; + if (cancelTeleportRequest(ess, onlineUser, user)) { + cancellations++; + } + } + if (cancellations > 0) { + user.sendMessage(tl("teleportRequestAllCancelled", cancellations)); + } else { + throw new Exception(tl("noPendingRequest")); + } + } else { + User targetPlayer = getPlayer(server, user, args, 0); + if (cancelTeleportRequest(ess, targetPlayer, user)) { + user.sendMessage(tl("teleportRequestSpecificCancelled", targetPlayer.getName())); + } + } + } +} diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java b/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java index 92765c418..ecc4fdf3b 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtpahere.java @@ -42,5 +42,6 @@ public class Commandtpahere extends EssentialsCommand { } } user.sendMessage(tl("requestSent", player.getDisplayName())); + user.sendMessage(tl("typeTpacancel")); } } diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 83da908b9..c4cdc7332 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -431,6 +431,8 @@ teleportDisabled=\u00a7c{0} \u00a74has teleportation disabled. teleportHereRequest=\u00a7c{0}\u00a76 has requested that you teleport to them. teleportNewPlayerError=\u00a74Failed to teleport new player\! teleportRequest=\u00a7c{0}\u00a76 has requested to teleport to you. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a76This request will timeout after\u00a7c {0} seconds\u00a76. teleportTop=\u00a76Teleporting to top. teleportationCommencing=\u00a76Teleportation commencing... @@ -460,6 +462,7 @@ treeFailure=\u00a74Tree generation failure. Try again on grass or dirt. treeSpawned=\u00a76Tree spawned. true=\u00a7atrue\u00a7r typeTpaccept=\u00a76To teleport, type \u00a7c/tpaccept\u00a76. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a76To deny this request, type \u00a7c/tpdeny\u00a76. typeWorldName=\u00a76You can also type the name of a specific world. unableToSpawnMob=\u00a74Unable to spawn mob. diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties index d7631e1e8..a4c5d65c8 100644 --- a/Essentials/src/messages_cs.properties +++ b/Essentials/src/messages_cs.properties @@ -425,6 +425,8 @@ teleportDisabled={0} mas teleportaci zablokovanou. teleportHereRequest=\u00a7c{0}\u00a7c vas pozadal aby jste se warpnul k nemu. teleportNewPlayerError=Teleportace noveho hrace selhala teleportRequest=\u00a7c{0}\u00a7c se chce teleportovat k tobe. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a77Tato zadost vyprsi za {0} sekund. teleportTop=\u00a77Teleportuji na vrch. teleportationCommencing=\u00a77Teleportace zahajena... @@ -453,6 +455,7 @@ treeFailure=\u00a7cNepodarilo se vytvorit strom. Zkus to znovu na trave nebo hli treeSpawned=\u00a77Strom vytvoren. true=\u00a72Ano\u00a7f typeTpaccept=\u00a77Pro prijmuti zadosti napis \u00a7c/tpaccept\u00a77. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a77Pokud chces odmitnout zadost napis \u00a7c/tpdeny\u00a77. typeWorldName=\u00a77Muzes take napsat specificky nazev sveta. unableToSpawnMob=Nemozne spawnout moba. diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties index 64f32de7d..5ba9b0d70 100644 --- a/Essentials/src/messages_da.properties +++ b/Essentials/src/messages_da.properties @@ -425,6 +425,8 @@ teleportDisabled=\u00a7c{0} \u00a74har deaktiveret teleportering. teleportHereRequest=\u00a7c{0}\u00a76 har anmodet om, at du teleporterer til spilleren. teleportNewPlayerError=\u00a74Kunne ikke teleportere ny spiller\! teleportRequest=\u00a7c{0}\u00a76 har anmodet om at teleportere til dig. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a76Denne anmodning vil udl\u00f8be efter\u00a7c {0} sekunder\u00a76. teleportTop=\u00a76Teleporterer til toppen. teleportationCommencing=\u00a76Teleportering begynder... @@ -453,6 +455,7 @@ treeFailure=\u00a74Fejl ved generering af tr\u00e6. Pr\u00f8v igen p\u00e5 gr\u0 treeSpawned=\u00a76Tr\u00e6 spawnet. true=\u00a7asandt\u00a7r typeTpaccept=\u00a76For et teleportere, skriv \u00a7c/tpaccept\u00a76. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a76For at afvise denne anmodning, skriv \u00a7c/tpdeny\u00a76. typeWorldName=\u00a76Du kan ogs\u00e5 skrive navnet p\u00e5 en specifikke verden. unableToSpawnMob=\u00a74Kan ikke spawne mob. diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index 61d073ac0..2f76ee3b3 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -429,6 +429,8 @@ teleportDisabled=\u00a7c{0} \u00a74verweigert die Teleportierung. teleportHereRequest=\u00a7c{0}\u00a76 fragt, ob du dich zu ihm teleportierst. teleportNewPlayerError=\u00a74Fehler beim Teleportieren eines neuen Spielers\! teleportRequest=\u00a7c{0}\u00a76 fragt, ob er sich zu dir teleportieren darf. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a76Diese Anfrage wird nach\u00a7c {0} Sekunden\u00a76 ung\u00fcltig. teleportTop=\u00a76Teleportiere nach oben. teleportationCommencing=\u00a76Teleportierung gestartet... @@ -457,6 +459,7 @@ treeFailure=\u00a74Baumpflanzung gescheitert. Versuche es nochmal auf Gras oder treeSpawned=\u00a76Baum gepflanzt. true=\u00a7aja\u00a7r typeTpaccept=\u00a76Um zu teleportieren, schreibe \u00a7c/tpaccept\u00a76. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a76Um diese Anfrage abzulehnen, schreibe \u00a7c/tpdeny\u00a76. typeWorldName=\u00a76Du kannst auch den Namen der Welt eingeben. unableToSpawnMob=\u00a74Fehler beim Erzeugen des Monsters. diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index 6c99824a0..933691dab 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -426,6 +426,8 @@ teleportDisabled=\u00a7c{0} \u00a74has teleportation disabled. teleportHereRequest=\u00a7c{0}\u00a76 has requested that you teleport to them. teleportNewPlayerError=\u00a74Failed to teleport new player\! teleportRequest=\u00a7c{0}\u00a76 has requested to teleport to you. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a76This request will timeout after\u00a7c {0} seconds\u00a76. teleportTop=\u00a76Teleporting to top. teleportationCommencing=\u00a76Teleportation commencing... @@ -454,6 +456,7 @@ treeFailure=\u00a74Tree generation failure. Try again on grass or dirt. treeSpawned=\u00a76Tree spawned. true=\u00a7atrue\u00a7r typeTpaccept=\u00a76To teleport, type \u00a7c/tpaccept\u00a76. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a76To deny this request, type \u00a7c/tpdeny\u00a76. typeWorldName=\u00a76You can also type the name of a specific world. unableToSpawnMob=\u00a74Unable to spawn mob. diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties index 5da6c14a7..16820fdfa 100644 --- a/Essentials/src/messages_es.properties +++ b/Essentials/src/messages_es.properties @@ -425,6 +425,8 @@ teleportDisabled=\u00a7c{0} \u00a74tiene la teletransportaci\u00f3n desactivada. teleportHereRequest=\u00a7c{0}\u00a76te ha pedido que te teletransportes hasta \u00e9l. teleportNewPlayerError=\u00a74\u00a1Ha ocurrido un error al teletransportar al nuevo jugador\! teleportRequest=\u00a7c{0}\u00a76 te ha pedido teletransportarse hasta ti. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a76La solicitud ser\u00e1 autom\u00e1ticamente cancelada despu\u00e9s de\u00a7c {0} segundos\u00a76. teleportTop=\u00a76Teletransportandote hasta la cima. teleportationCommencing=\u00a76Teletransportando... @@ -453,6 +455,7 @@ treeFailure=\u00a7cError al generar el \u00e1rbol. Prueba de nuevo en tierra, ti treeSpawned=\u00a77\u00c1rbol generado. true=\u00a7as\u00ed\u00a7f typeTpaccept=\u00a76Escribe \u00a7c/tpaccept \u00a76para aceptar el teletransporte. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a76Para denegar la teletransportaci\u00f3n, escribe \u00a7c/tpdeny\u00a76. typeWorldName=\u00a76T\u00fa tambi\u00e9n puedes escribir el nombre de un mundo espec\u00edfico. unableToSpawnMob=\u00a74No puedes generar criaturas. diff --git a/Essentials/src/messages_et.properties b/Essentials/src/messages_et.properties index 569f2aa59..26cb5cb39 100644 --- a/Essentials/src/messages_et.properties +++ b/Essentials/src/messages_et.properties @@ -425,6 +425,8 @@ teleportDisabled=\u00a7c{0}\u00a74-il on teleportimine disabled. teleportHereRequest=\u00a7c{0}\u00a76 saatis teile kutse, et telepordiksid nende juurde. teleportNewPlayerError=\u00a74Viga teleportimisel uut m\u00e4ngijat\! teleportRequest=\u00a7c{0}\u00a76 soovib teie juurde teleportida. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a76See kutse aegub peale\u00a7c {0} sekundit\u00a76. teleportTop=\u00a76Teleporteerud \u00fcles. teleportationCommencing=\u00a76Teleporteerumine algab... @@ -453,6 +455,7 @@ treeFailure=\u00a74Puidu generatsiooni viga. Proovi uuesti muru v\u00f5i mulla p treeSpawned=\u00a76Puu on tekitatud. true=\u00a7atrue\u00a7r typeTpaccept=\u00a76Et teleportida, kirjuta \u00a7c/tpaccept\u00a76. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a76Et h\u00fcljata seda kutset, kirjuta \u00a7c/tpdeny\u00a76. typeWorldName=\u00a76V\u00f5ite kirjutada ka teatud maailma nime. unableToSpawnMob=\u00a74Eluka tekitamisel tekkis viga. diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties index 659df4be5..ca0807f7a 100644 --- a/Essentials/src/messages_fi.properties +++ b/Essentials/src/messages_fi.properties @@ -425,6 +425,8 @@ teleportDisabled=Pelaajalla {0} on teleporttaus poissa k\u00e4yt\u00f6st\u00e4. teleportHereRequest=\u00a7c{0}\u00a7c on pyyt\u00e4nyt, ett\u00e4 sin\u00e4 teleporttaat heid\u00e4n luokseen. teleportNewPlayerError=Virhe teleportattaessa uutta pelaajaa teleportRequest=\u00a7c{0}\u00a7c on pyyt\u00e4nyt lupaa sinun luokse teleporttaamiseen. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a77T\u00e4m\u00e4 pyynt\u00f6 aikakatkaistaan {0} sekunnin kuluttua. teleportTop=\u00a77Teleportataan p\u00e4\u00e4lle. teleportationCommencing=\u00a77Teleportataan... @@ -453,6 +455,7 @@ treeFailure=\u00a7cPuun luominen ep\u00e4onnistui. Yrit\u00e4 uudelleen nurmikol treeSpawned=\u00a77Puu luotu. true=totta typeTpaccept=\u00a77Hyv\u00e4ksy\u00e4ksesi, kirjoita \u00a7c/tpaccept\u00a77. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a77Kielt\u00e4\u00e4ksesi, kirjoita \u00a7c/tpdeny\u00a77. typeWorldName=\u00a77Voit my\u00f6s laittaa maailman nimen. unableToSpawnMob=Ei voida luoda mobia. diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties index 0fa2ef522..a21651368 100644 --- a/Essentials/src/messages_fr.properties +++ b/Essentials/src/messages_fr.properties @@ -426,6 +426,8 @@ teleportDisabled={0} a la t\u00e9l\u00e9portation d\u00e9sactiv\u00e9. teleportHereRequest=\u00a7c{0}\u00a7c Vous a demand\u00e9 de vous t\u00e9l\u00e9porter \u00e0 lui/elle. teleportNewPlayerError=\u00c9chec de la t\u00e9l\u00e9portation du nouveau joueur. teleportRequest=\u00a7c{0}\u00a7c vous demande s''il peut se t\u00e9l\u00e9porter vers vous. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a77Cette demande de t\u00e9l\u00e9portation expirera dans {0} secondes. teleportTop=\u00a77T\u00e9l\u00e9portation vers le haut. teleportationCommencing=\u00a77D\u00e9but de la t\u00e9l\u00e9portation... @@ -454,6 +456,7 @@ treeFailure=\u00a7c\u00c9chec de la g\u00e9n\u00e9ration de l''arbre. Essayez de treeSpawned=\u00a77Arbre cr\u00e9\u00e9. true=\u00a72oui\u00a7f typeTpaccept=\u00a77Pour le t\u00e9l\u00e9porter, utilisez \u00a7c/tpaccept\u00a77 \u00a77ou \u00a7c/tpyes\u00a77. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a77Pour d\u00e9cliner cette demande, utilisez \u00a7c/tpdeny\u00a77 \u00a77ou \u00a7c/tpno\u00a77. typeWorldName=\u00a77Vous pouvez aussi taper le nom d''un monde sp\u00e9cifique. unableToSpawnMob=Incapable d''invoquer une cr\u00e9ature. diff --git a/Essentials/src/messages_hu.properties b/Essentials/src/messages_hu.properties index eccf46577..ba1ef1f6a 100644 --- a/Essentials/src/messages_hu.properties +++ b/Essentials/src/messages_hu.properties @@ -425,6 +425,8 @@ teleportDisabled=\u00a7c{0} \u00a74letiltotta, hogy r\u00e1 teleport\u00e1ljanak teleportHereRequest=\u00a7c{0}\u00a76 szeretn\u00e9, hogy hozz\u00e1 teleport\u00e1lj. teleportNewPlayerError=\u00a74Failed to teleport new player\! teleportRequest=\u00a7c{0}\u00a76 hozz\u00e1d szeretne teleport\u00e1lni. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a76\u00a7c{0} m\u00e1sodperced\u00a76 van, hogy ezt elfogadd. teleportTop=\u00a76Teleport\u00e1l\u00e1s a legmagasabb pontra. teleportationCommencing=\u00a76Teleport\u00e1l\u00e1s megkezd\u00e9se... @@ -453,6 +455,7 @@ treeFailure=\u00a74Tree generation failure. Try again on grass or dirt. treeSpawned=\u00a76Fa spawnolva. true=\u00a7aigaz\u00a7r typeTpaccept=\u00a76Hogy elfogadd \u00edrd be \u00a7c/tpaccept\u00a76. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a76Hogy elutas\u00edtsd \u00edrd be \u00a7c/tpdeny\u00a76. typeWorldName=\u00a76You can also type the name of a specific world. unableToSpawnMob=\u00a74Unable to spawn mob. diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties index 3cd49c203..2afdf84ea 100644 --- a/Essentials/src/messages_it.properties +++ b/Essentials/src/messages_it.properties @@ -425,6 +425,8 @@ teleportDisabled={0} ha il teletrasporto disabilitato. teleportHereRequest=\u00a7c{0}\u00a7c ha richiesto di teletrasportati da loro. teleportNewPlayerError=Teletrasporto del nuovo player fallito teleportRequest=\u00a7c{0}\u00a7c ha richiesto di teletrasportati da te. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a77Questa richiesta scadra'' tra {0} secondi. teleportTop=\u00a77Teletrasporto in cima. teleportationCommencing=\u00a77Inizio teletrasporto... @@ -453,6 +455,7 @@ treeFailure=\u00a74Creazione dell''albero fallita. Riprova sull''erba o sulla te treeSpawned=\u00a76Albero generato. true=\u00a7avero\u00a7r typeTpaccept=\u00a76Per accettare il teletrasporto,digita \u00a7c/tpaccept\u00a76. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a76Per rifiutare il teletrasporto, digita \u00a7c/tpdeny\u00a76. typeWorldName=\u00a76Puoi anche digitare il nome di un mondo. unableToSpawnMob=\u00a74Impossibile generare il mob. diff --git a/Essentials/src/messages_ko.properties b/Essentials/src/messages_ko.properties index bfbfd4731..034c46692 100644 --- a/Essentials/src/messages_ko.properties +++ b/Essentials/src/messages_ko.properties @@ -425,6 +425,8 @@ teleportDisabled=\u00a7c{0}\u00a74\uc5d0 \ub300\ud55c \ud154\ub808\ud3ec\ud2b8\u teleportHereRequest=\u00a7c{0}\u00a7c \ub294 \uc694\uccad\uc744 \ubc1b\uc544\ub4e4\uc600\uc2b5\ub2c8\ub2e4. teleportNewPlayerError=\u00a74\uc0c8\ub85c\uc6b4 \ud50c\ub808\uc774\uc5b4\ub97c \ud154\ub808\ud3ec\ud2b8 \uc2dc\ud0ac \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. teleportRequest=\u00a7c{0}\u00a76\ub2d8\uaed8\uc11c \ub2f9\uc2e0\uc5d0\uac8c \ud154\ub808\ud3ec\ud2b8 \uc694\uccad\uc744 \ud558\uc600\uc2b5\ub2c8\ub2e4. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a7c{0}\u00a76\ucd08 \ud6c4 \ud154\ub808\ud3ec\ud2b8 \uc694\uccad\uc774 \uc2dc\uac04\ucd08\uacfc\ub429\ub2c8\ub2e4 teleportTop=\u00a76\uaf2d\ub300\uae30\ub85c \uc62c\ub77c\uc654\uc2b5\ub2c8\ub2e4. teleportationCommencing=\u00a76\ud154\ub808\ud3ec\ud2b8 \uc911... @@ -453,6 +455,7 @@ treeFailure=\u00a74\ub098\ubb34 \uc0dd\uc131\uc774 \uc2e4\ud328\ud558\uc600\uc2b treeSpawned=\u00a76\ub098\ubb34 \uc18c\ud658\ub428. true=\u00a7a\ucc38\u00a7r typeTpaccept=\u00a76\uc21c\uac04\uc774\ub3d9 \uc694\uccad\uc744 \uc218\ub77d\ud558\ub824\uba74, \u00a7c/tpaccept\u00a76 \ub97c \uc785\ub825\ud558\uc138\uc694. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a77\ud154\ub808\ud3ec\ud2b8 \uc694\uccad\uc744 \uac70\uc808\ud558\ub824\uba74, \u00a7c/tpdeny\u00a77\ub97c \uc785\ub825\ud558\uc138\uc694. typeWorldName=\u00a76\ub2f9\uc2e0\uc740 \ud2b9\uc815\ud55c \uc138\uacc4\uc758 \uc885\ub958\ub97c \uc9c0\uba85\ud560 \uc218\ub3c4 \uc788\uc2b5\ub2c8\ub2e4. unableToSpawnMob=\u00a74\ubaac\uc2a4\ud130 \uc18c\ud658\uc744 \ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. diff --git a/Essentials/src/messages_lt.properties b/Essentials/src/messages_lt.properties index c8ee3dc66..8b78dd820 100644 --- a/Essentials/src/messages_lt.properties +++ b/Essentials/src/messages_lt.properties @@ -425,6 +425,8 @@ teleportDisabled=\u00a7c{0} \u00a74yra i\u0161jung\u0119s teleportacijas. teleportHereRequest=\u00a7c{0}\u00a76 pra\u0161o, kad atsiteleportuotum pas juos. teleportNewPlayerError=\u00a74Nepavyko atiteleportuoti naujo \u017eaid\u0117jo\! teleportRequest=\u00a7c{0}\u00a76 pra\u0161o, kad gal\u0117tu pas tave atsiteleportuoti. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a76Pra\u0161ymas bus anuliuotas po\u00a7c {0} sekundzi\u0173\u00a76. teleportTop=\u00a76Teleportuojama \u012f pat\u012f vir\u0161\u0173. teleportationCommencing=\u00a76Prasideda teleportacija... @@ -453,6 +455,7 @@ treeFailure=\u00a74Tree generation failure. Try again on grass or dirt. treeSpawned=\u00a76Tree spawned. true=\u00a7atrue\u00a7r typeTpaccept=\u00a76Norint priimti teleportacija, ra\u0161ykit \u00a7c/tpaccept\u00a76. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a76Norint atmesti teleportacija, ra\u0161ykit \u00a7c/tpdeny\u00a76. typeWorldName=\u00a76You can also type the name of a specific world. unableToSpawnMob=\u00a74Unable to spawn mob. diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index ebc0f1103..508c118bb 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -425,6 +425,8 @@ teleportDisabled=\u00a7c{0} \u00a74heeft teleporteren uitgeschakeld. teleportHereRequest=\u00a7c{0}\u00a76 Heeft gevraagd of u naar hem wilt teleporteren. teleportNewPlayerError=\u00a74Fout bij het teleporteren van nieuwe speler\! teleportRequest=\u00a7c{0}\u00a76 vraagt of hij naar u kan teleporteren. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a76Dit verzoekt verloopt na\u00a7c {0} seconde(n)\u00a76. teleportTop=\u00a77Bezig met teleporteren naar het hoogste punt. teleportationCommencing=\u00a76an het beginnen met teleporteren... @@ -453,6 +455,7 @@ treeFailure=\u00a74Fout bij het genereren van de boom. Probeer het opnieuw op gr treeSpawned=\u00a76Boom gegenereerd. true=\u00a7ajuist\u00a7r typeTpaccept=\u00a76Om te accepteren, typ \u00a7c/tpaccept\u00a76. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a76Om te weigeren, typ \u00a7c/tpdeny\u00a76. typeWorldName=\u00a76U kunt ook de naam van een specifieke wereld typen. unableToSpawnMob=\u00a74De mob kan niet gespawnt worden. diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties index 15b387f4f..6c5605baf 100644 --- a/Essentials/src/messages_pl.properties +++ b/Essentials/src/messages_pl.properties @@ -425,6 +425,8 @@ teleportDisabled=\u00a7c{0} \u00a74ma zdezaktywowana teleportacje. teleportHereRequest=\u00a7c{0}\u00a77 ma zadanie przeteleportowac cie do nich. teleportNewPlayerError=\u00a74Blad przy teleportowniu nowego gracza. teleportRequest=\u00a7c{0}\u00a77 prosbe o teleportacje do Ciebie. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a77 Prosba o teleportacje przedawni sie za\u00a7c {0} \u00a77sekund. teleportTop=\u00a77Teleportacja na wierzch. teleportationCommencing=\u00a77Teleport rozgrzewa sie... @@ -453,6 +455,7 @@ treeFailure=\u00a74Utworzenie drzewa nie powiodlo sie, sprobuj na trawie lub zie treeSpawned=\u00a77Stworzono drzewo. true=\u00a72tak\u00a7r typeTpaccept=\u00a77Aby zaakceptowac teleport, wpisz \u00a7c/tpaccept\u00a77. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a77Aby odmowic teleportacji, wpisz \u00a7c/tpdeny\u00a77. typeWorldName=\u00a77Mozesz rowniez wpisac nazwe danego swiata. unableToSpawnMob=\u00a74Nie udalo sie stworzyc potwora. diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties index e1e58d60b..505e7e481 100644 --- a/Essentials/src/messages_pt.properties +++ b/Essentials/src/messages_pt.properties @@ -425,6 +425,8 @@ teleportDisabled=\u00A7c{0} \u00A74est\u00E1 com teletransporte desativado. teleportHereRequest=\u00A7c{0}\u00A76 pediu para que te teletransportasses at\u00E9 ele. teleportNewPlayerError=\u00A74Falha ao teletransportar novo jogador! teleportRequest=\u00A7c{0}\u00A76 pediu para se teletransportar at\u00E9 ti. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00A76O pedido vai-se esgotar daqui a\u00A7c {0} segundos\u00A76. teleportTop=\u00A76Indo para o topo. teleportationCommencing=\u00A76Teletransportando... @@ -453,6 +455,7 @@ treeFailure=\u00A74Erro ao gerar \u00E1rvore. Tenta novamente na terra ou na rel treeSpawned=\u00A76\u00C1rvore gerada. true=\u00A7averdadeiro\u00A7r typeTpaccept=\u00A76Para teletransportar, digita \u00A7c/tpaccept\u00A76. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00A76Para recusar o pedido, digita \u00A7c/tpdeny\u00A76. typeWorldName=\u00A76Tamb\u00E9m podes digitar o nome de um mundo espec\u00EDfico. unableToSpawnMob=\u00A74Incapaz de spawnar o mob. diff --git a/Essentials/src/messages_pt_BR.properties b/Essentials/src/messages_pt_BR.properties index 549c25b33..042ca5ba4 100644 --- a/Essentials/src/messages_pt_BR.properties +++ b/Essentials/src/messages_pt_BR.properties @@ -425,6 +425,8 @@ teleportDisabled=\u00A7c{0} \u00A74est\u00E1 com teleporte desativado. teleportHereRequest=\u00A7c{0}\u00A76 pediu para que voc\uuea se teleporte at\u00E9 ele. teleportNewPlayerError=\u00A74Falha ao teleportar novo jogador\! teleportRequest=\u00A7c{0}\u00A76 pediu para teleportar ate voc\uuea. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00A76Esse pedido ir\u00E1 se esgotar depois de\u00A7c {0} segundos\u00A76. teleportTop=\u00A76Indo para o topo. teleportationCommencing=\u00A76Teleportando... @@ -453,6 +455,7 @@ treeFailure=\u00A74Erro ao gerar \u00E1rvore. Tente novamente na terra ou na gra treeSpawned=\u00A76\u00C1rvore gerada. true=\u00A7averdadeiro\u00A7r typeTpaccept=\u00A76Para teleportar, digite \u00A7c/tpaccept\u00A76. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00A76Para recusar o pedido, digite \u00A7c/tpdeny\u00A76. typeWorldName=\u00A76Voc\u00EA pode tamb\u00E9m digitar o nome de um mundo espec\u00EDfico. unableToSpawnMob=\u00A74Incapaz de spawnar o mob. diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties index 961d57c71..da24b779a 100644 --- a/Essentials/src/messages_ro.properties +++ b/Essentials/src/messages_ro.properties @@ -425,6 +425,8 @@ teleportDisabled=\u00a7c{0} \u00a74are teleportarea dezactivata. teleportHereRequest=\u00a7c{0}\u00a76 ti-a cerut sa te teleportezi la ei. teleportNewPlayerError=\u00a74Teleportarea jucatorului nou a dat gres\! teleportRequest=\u00a7c{0}\u00a76 a cerut sa se teleporteze la tine. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a76Aceasta cerere va expira in\u00a7c {0} secunde\u00a76. teleportTop=\u00a76Teleporteaza la cel mai inalt punct. teleportationCommencing=\u00a76Teleportarea urmeaza... @@ -453,6 +455,7 @@ treeFailure=\u00a74Generarea copacului a esuat. Incearca pe pamand sau iarba. treeSpawned=\u00a76Copac generat. true=\u00a7aadevarat\u00a7r typeTpaccept=\u00a76Pentru a accepta teleportarea, scrie \u00a7c/tpaccept\u00a76. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a76Pentru a refuza teleportarea, scrie \u00a7c/tpdeny\u00a76. typeWorldName=\u00a76De asemenea poti scrie numele unei lumi. unableToSpawnMob=\u00a74Nu se poate genera mobul. diff --git a/Essentials/src/messages_ru.properties b/Essentials/src/messages_ru.properties index 445347fe3..98388aadf 100644 --- a/Essentials/src/messages_ru.properties +++ b/Essentials/src/messages_ru.properties @@ -425,6 +425,8 @@ teleportDisabled=\u00a7c{0} \u00a74\u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0 teleportHereRequest=\u00a7c{0}\u00a76 \u043f\u0440\u043e\u0441\u0438\u0442 \u0412\u0430\u0441 \u0442\u0435\u043b\u0435\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u043a \u043d\u0435\u043c\u0443. teleportNewPlayerError=\u00a74\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0442\u0435\u043b\u0435\u043f\u043e\u0440\u0442\u0435 \u043d\u043e\u0432\u043e\u0433\u043e \u0438\u0433\u0440\u043e\u043a\u0430\! teleportRequest=\u00a7c{0}\u00a76 \u043f\u0440\u043e\u0441\u0438\u0442 \u0442\u0435\u043b\u0435\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u043a \u0412\u0430\u043c. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a76\u0417\u0430\u044f\u0432\u043a\u0430 \u0431\u0443\u0434\u0435\u0442 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438 \u043e\u0442\u043c\u0435\u043d\u0435\u043d\u0430 \u0447\u0435\u0440\u0435\u0437\u00a7c {0} \u0441\u0435\u043a\u0443\u043d\u0434\u00a76. teleportTop=\u00a76\u0422\u0435\u043b\u0435\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043d\u0430\u0432\u0435\u0440\u0445. teleportationCommencing=\u00a76\u0422\u0435\u043b\u0435\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043d\u0430\u0447\u0438\u043d\u0430\u0435\u0442\u0441\u044f... @@ -453,6 +455,7 @@ treeFailure=\u00a74\u041d\u0435 \u0441\u043c\u043e\u0433 \u0441\u0433\u0435\u043 treeSpawned=\u00a76\u0414\u0435\u0440\u0435\u0432\u043e \u0441\u043e\u0437\u0434\u0430\u043d\u043e. true=\u00a7a\u0438\u0441\u0442\u0438\u043d\u0430\u00a7r typeTpaccept=\u00a76\u0414\u043b\u044f \u043f\u0440\u0438\u043d\u044f\u0442\u0438\u044f \u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u00a7c/tpaccept\u00a76. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a76\u0414\u043b\u044f \u043e\u0442\u043a\u0430\u0437\u0430 \u043e\u0442 \u0437\u0430\u043f\u0440\u043e\u0441\u0430 \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u00a7c/tpdeny\u00a76. typeWorldName=\u00a76\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u043e\u0433\u043e \u043c\u0438\u0440\u0430. unableToSpawnMob=\u00a74\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u0441\u043f\u0430\u0443\u043d\u0438\u0442\u044c \u043c\u043e\u0431\u0430. diff --git a/Essentials/src/messages_sv.properties b/Essentials/src/messages_sv.properties index 6c9c2eb08..9300b2ef9 100644 --- a/Essentials/src/messages_sv.properties +++ b/Essentials/src/messages_sv.properties @@ -425,6 +425,8 @@ teleportDisabled={0} har teleportering inaktiverat. teleportHereRequest=\u00a7c{0}\u00a7c har fr\u00e5gat dig om du vill teleportera till dem. teleportNewPlayerError=Messlyckades med att teleportera ny spelare teleportRequest=\u00a7c{0}\u00a7c har beg\u00e4rt att f\u00e5 teleportera sig till dig. +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a77Den h\u00e4r beg\u00e4ran kommer att g\u00e5 ut efter {0} sekunder. teleportTop=\u00a77Teleporterar till toppen. teleportationCommencing=\u00a77Teleporteringen p\u00e5b\u00f6rjas... @@ -453,6 +455,7 @@ treeFailure=\u00a7cTr\u00e4dgenereringn misslyckades. Prova igen p\u00e5 gr\u00e treeSpawned=\u00a77Tr\u00e4d genererat. true=sant typeTpaccept=\u00a77F\u00f6r att teleportera, skriv \u00a7c/tpaccept\u00a77. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a77F\u00f6r att neka denna f\u00f6rfr\u00e5gan, skriv \u00a7c/tpdeny\u00a77. typeWorldName=\u00a77Du kan ocks\u00e5 skriva namnet av en specifik v\u00e4rld. unableToSpawnMob=Kunde inte spawna moben. diff --git a/Essentials/src/messages_tr.properties b/Essentials/src/messages_tr.properties index 62b297d35..6c4124fa3 100644 --- a/Essentials/src/messages_tr.properties +++ b/Essentials/src/messages_tr.properties @@ -425,6 +425,8 @@ teleportDisabled=\u00a7c{0} \u00a74Isinlanma Modu Aktif Degil\! teleportHereRequest=\u00a7c{0}\u00a76 Kendisine Isinlanmani Istiyor. teleportNewPlayerError=\u00a74Yeni Oyuncuyu Isinlarken Hata Oldu teleportRequest=\u00a7c{0}\u00a76 Sana Bir Isinlanma Istegi Yolladi +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a76Istek\u00a7c {0} seconds\u00a76 Sonra Zaman Asimina Ugrayicak. teleportTop=\u00a76En Yuksege Isinlaniliyor teleportationCommencing=\u00a76Isinlanma Gerceklesiyor... @@ -453,6 +455,7 @@ treeFailure=\u00a74Agac Dikilmede Sorun Olustu, Cimenin Yada Topragin Ustune Yen treeSpawned=\u00a76Agac Dikildi true=\u00a7adogru\u00a7r typeTpaccept=\u00a76Kabul Etmek Icin \u00a7c/tpaccept\u00a76. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a76Redetmek Icin \u00a7c/tpdeny\u00a76. typeWorldName=\u00a76Belirli bir dunya ismi de yazabilirsin. unableToSpawnMob=\u00a74Spawn Dogurma Acik Degil diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties index 8b8986234..486e0724d 100644 --- a/Essentials/src/messages_zh.properties +++ b/Essentials/src/messages_zh.properties @@ -425,6 +425,8 @@ teleportDisabled=\u00a7c{0}\u00a74 \u53d6\u6d88\u4e86\u4f20\u9001 teleportHereRequest=\u00a7c{0}\u00a74 \u8bf7\u6c42\u4f60\u4f20\u9001\u5230\u4ed6\u90a3\u91cc teleportNewPlayerError=\u00a74\u4f20\u9001\u65b0\u73a9\u5bb6\u5931\u8d25 teleportRequest=\u00a7c{0}\u00a76 \u8bf7\u6c42\u4f20\u9001\u5230\u4f60\u8fd9\u91cc +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a76\u6b64\u8bf7\u6c42\u5c06\u5728 {0} \u79d2\u540e\u81ea\u52a8\u53d6\u6d88. teleportTop=\u00a76\u4f20\u9001\u5230\u9876\u90e8 teleportationCommencing=\u00a76\u51c6\u5907\u4f20\u9001... @@ -453,6 +455,7 @@ treeFailure=\u00a74\u751f\u6210\u6811\u6728\u5931\u8d25,\u5728\u8349\u5757\u4e0a treeSpawned=\u00a76\u751f\u6210\u6811\u6728\u6210\u529f true=\u00a7a\u662f\u00a7r typeTpaccept=\u00a76\u82e5\u60f3\u63a5\u53d7\u4f20\u9001,\u8f93\u5165 \u00a74/tpaccept\u00a76. +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a76\u82e5\u60f3\u62d2\u7edd\u4f20\u9001,\u8f93\u5165 \u00a74/tpdeny\u00a76 typeWorldName=\u00a76\u4f60\u4e5f\u53ef\u4ee5\u8f93\u5165\u6307\u5b9a\u7684\u4e16\u754c\u7684\u540d\u5b57 unableToSpawnMob=\u00a74\u751f\u6210\u751f\u7269\u5931\u8d25 diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties index 8fa0bfb5a..6c11e3a87 100644 --- a/Essentials/src/messages_zh_HK.properties +++ b/Essentials/src/messages_zh_HK.properties @@ -425,6 +425,8 @@ teleportDisabled=\u00a7c{0}\u00a74 \u53d6\u6d88\u4e86\u50b3\u9001 teleportHereRequest=\u00a7c{0}\u00a74 \u8acb\u6c42\u4f60\u50b3\u9001\u5230\u4ed6\u90a3\u88e1 teleportNewPlayerError=\u00a74\u50b3\u9001\u65b0\u73a9\u5bb6\u5931\u6557 teleportRequest=\u00a7c{0}\u00a76 \u8acb\u6c42\u50b3\u9001\u5230\u4f60\u9019\u88e1 +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a76\u6b64\u8acb\u6c42\u5c07\u5728 {0} \u79d2\u5167\u53d6\u6d88 teleportTop=\u00a76\u50b3\u9001\u5230\u9802\u90e8 teleportationCommencing=\u00a76\u6e96\u5099\u50b3\u9001... @@ -453,6 +455,7 @@ treeFailure=\u00a74\u751f\u6210\u6a39\u6728\u5931\u6557,\u5728\u8349\u584a\u4e0a treeSpawned=\u00a76\u751f\u6210\u6a39\u6728\u6210\u529f true=\u00a7a\u662f\u00a7r typeTpaccept=\u00a76\u82e5\u60f3\u63a5\u53d7\u50b3\u9001,\u8f38\u5165 \u00a74/tpaccept\u00a76 +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a76\u82e5\u60f3\u62d2\u7d55\u50b3\u9001,\u8f38\u5165 \u00a74/tpdeny\u00a76 typeWorldName=\u00a76\u4f60\u4e5f\u53ef\u4ee5\u8f38\u5165\u6307\u5b9a\u7684\u4e16\u754c\u7684\u540d\u5b57 unableToSpawnMob=\u00a74\u751f\u6210\u751f\u7269\u5931\u6557 diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties index d11bec6f3..ace2bcd74 100644 --- a/Essentials/src/messages_zh_TW.properties +++ b/Essentials/src/messages_zh_TW.properties @@ -425,6 +425,8 @@ teleportDisabled=\u00a7c{0}\u00a74 \u53d6\u6d88\u4e86\u50b3\u9001 teleportHereRequest=\u00a7c{0}\u00a74 \u8acb\u6c42\u4f60\u50b3\u9001\u5230\u4ed6\u90a3\u88e1 teleportNewPlayerError=\u00a74\u50b3\u9001\u65b0\u73a9\u5bb6\u5931\u6557 teleportRequest=\u00a7c{0}\u00a76 \u8acb\u6c42\u50b3\u9001\u5230\u4f60\u9019\u88e1 +teleportRequestAllCancelled=\u00a76All outstanding teleport requests cancelled. +teleportRequestSpecificCancelled=\u00a76Outstanding teleport request with {0} cancelled. teleportRequestTimeoutInfo=\u00a76\u6b64\u8acb\u6c42\u5c07\u5728 {0} \u79d2\u5167\u53d6\u6d88 teleportTop=\u00a76\u50b3\u9001\u5230\u9802\u90e8 teleportationCommencing=\u00a76\u6e96\u5099\u50b3\u9001... @@ -453,6 +455,7 @@ treeFailure=\u00a74\u751f\u6210\u6a39\u6728\u5931\u6557,\u5728\u8349\u584a\u4e0a treeSpawned=\u00a76\u751f\u6210\u6a39\u6728\u6210\u529f true=\u00a7a\u662f\u00a7r typeTpaccept=\u00a76\u82e5\u60f3\u63a5\u53d7\u50b3\u9001,\u8f38\u5165 \u00a74/tpaccept\u00a76 +typeTpacancel=\u00a76To cancel this request, type \u00a7c/tpacancel\u00a76. typeTpdeny=\u00a76\u82e5\u60f3\u62d2\u7d55\u50b3\u9001,\u8f38\u5165 \u00a74/tpdeny\u00a76 typeWorldName=\u00a76\u4f60\u4e5f\u53ef\u4ee5\u8f38\u5165\u6307\u5b9a\u7684\u4e16\u754c\u7684\u540d\u5b57 unableToSpawnMob=\u00a74\u751f\u6210\u751f\u7269\u5931\u6557 diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index 5b4304971..01b979bbe 100644 --- a/Essentials/src/plugin.yml +++ b/Essentials/src/plugin.yml @@ -435,6 +435,10 @@ commands: description: Teleport all online players to another player. usage: / aliases: [etpall] + tpacancel: + description: Cancel all outstanding teleport requests. Specify [player] to cancel requests with them. + usage: / [player] + aliases: [etpacancel] tpdeny: description: Reject a teleport request. usage: /