Show tempban expiry on join. Fixes #1680

Outputs a different message with the expiry included.

Add unlocalised tempbanJoin to locale files

Outputs a different message with the expiry included.

Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java

@@ -363,7 +363,13 @@ public class EssentialsPlayerListener implements Listener {
             case KICK_BANNED:
                 BanEntry banEntry = ess.getServer().getBanList(BanList.Type.NAME).getBanEntry(event.getPlayer().getName());
                 if (banEntry != null) {
-                    event.setKickMessage(tl("banJoin", banEntry.getReason()));
+                    Date banExpiry = banEntry.getExpiration();
+                    if (banExpiry != null) {
+                        String expiry = DateUtil.formatDateDiff(banExpiry.getTime());
+                        event.setKickMessage(tl("tempbanJoin", banExpiry.getTime(), banEntry.getReason()));
+                    } else {
+                        event.setKickMessage(tl("banJoin", banEntry.getReason()));
+                    }
                 } else {
                     banEntry = ess.getServer().getBanList(BanList.Type.IP).getBanEntry(event.getAddress().getHostAddress());
                     if (banEntry != null) {

Essentials/src/messages.properties

@@ -451,6 +451,7 @@ teleporting=\u00a76Teleporting...
 teleportToPlayer=\u00a76Teleporting to \u00a7c{0}\u00a76.
 tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a74You may not tempban that player.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a76You\u00a7c {0} \u00a76thunder in your world.
 thunderDuration=\u00a76You\u00a7c {0} \u00a76thunder in your world for\u00a7c {1} \u00a76seconds.
 timeBeforeHeal=\u00a74Time before next heal\:\u00a7c {0}\u00a76.

Essentials/src/messages_cs.properties

@@ -443,6 +443,7 @@ teleporting=\u00a77Teleportuji...
 teleportToPlayer=\u00a76Teleportuji k hraci \u00a7c{0}\u00a76.
 tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a77Nemel by jsi docasne zabanovat tohoto hrace.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=Nastavil jsi {0} bouri ve tvem svete.
 thunderDuration=Nastavil jsi {0} bouri ve svete po {1} sekund.
 timeBeforeHeal=Potrebny cas pro dalsi uzdraveni\: {0}

Essentials/src/messages_da.properties

@@ -443,6 +443,7 @@ teleporting=\u00a76Teleporterer...
 teleportToPlayer=\u00a76Teleporterer til \u00a7c{0}\u00a76.
 tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a74Du kan ikke tempbanne den spiller.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a76Du har\u00a7c {0} \u00a76torden i din verden.
 thunderDuration=\u00a76Du har\u00a7c {0} \u00a76torden i din verden i\u00a7c {1} \u00a76sekunder.
 timeBeforeHeal=\u00a74Tid inden n\u00e6ste helbredelse\:\u00a7c {0}\u00a76.

Essentials/src/messages_de.properties

@@ -447,6 +447,7 @@ teleporting=\u00a76Teleportiere...
 teleportToPlayer=\u00a76teleportieren zu \u00a7c{0}\u00a76.
 tempBanned=\u00a7cDu wurdest f\u00fcr {0} verbannt\:\n\u00a7r{2}
 tempbanExempt=\u00a74Du kannst diesen Spieler nicht zeitlich bannen.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a76Es donnert nun in deiner Welt \u00a7c{0}\u00a76.
 thunderDuration=\u00a76Es donnert nun f\u00fcr\u00a7c {1} \u00a76Sekunden in deiner Welt\u00a7c {0}\u00a76.
 timeBeforeHeal=\u00a74Zeit bis zur n\u00e4chsten Heilung\:\u00a7c {0}\u00a76.

Essentials/src/messages_en.properties

@@ -445,6 +445,7 @@ teleporting=\u00a76Teleporting...
 teleportToPlayer=\u00a76Teleporting to \u00a7c{0}\u00a76.
 tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a74You may not tempban that player.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a76You\u00a7c {0} \u00a76thunder in your world.
 thunderDuration=\u00a76You\u00a7c {0} \u00a76thunder in your world for\u00a7c {1} \u00a76seconds.
 timeBeforeHeal=\u00a74Time before next heal\:\u00a7c {0}\u00a76.

Essentials/src/messages_es.properties

@@ -443,6 +443,7 @@ teleporting=\u00a76Teletransportando...
 teleportToPlayer=\u00a76Teletransport\u00e1ndose a \u00a7c{0}\u00a76.
 tempBanned=\u00a7cHas sido baneado temporalmente por {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a74No puedes banear temporalmente a ese usuario.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a76Has cambiado los truenos a\u00a7c {0} \u00a76en tu mundo.
 thunderDuration=\u00a76Has\u00a7c {0} \u00a76una tormenta en tu mundo durante\u00a7c {1} \u00a76segundos.
 timeBeforeHeal=Tiempo antes de la siguiente curacion\: {0}

Essentials/src/messages_et.properties

@@ -443,6 +443,7 @@ teleporting=\u00a76Teleportimine...
 teleportToPlayer=\u00a76Telepordin \u00a7c{0}\u00a76 juurde.
 tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a74Sa ei v\u00f5i seda m\u00e4ngijat ajutiselt blokeerida.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a76Sa\u00a7c {0} \u00a76\u00e4ikeseliseks oma maailmas.
 thunderDuration=\u00a76Sa\u00a7c {0} \u00a76\u00e4ikeliseks oma maailmas\u00a7c {1} \u00a76sekundiks.
 timeBeforeHeal=\u00a74Aeg enne j\u00e4rgmist elustamist\:\u00a7c {0}\u00a76.

Essentials/src/messages_fi.properties

@@ -443,6 +443,7 @@ teleporting=\u00a77Teleportataan...
 teleportToPlayer=\u00a76Teleportataan \u00a7c {0} \u00a76.
 tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a77Et voi bannia tuota pelaajaa
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=Myrsky {0} maailmassasi
 thunderDuration=Myrsky {0} maailmassasi {1} sekuntia.
 timeBeforeHeal=Aika ennen seuraavaa parannusta\: {0}

Essentials/src/messages_fr.properties

@@ -450,6 +450,7 @@ teleporting=\u00a77T\u00e9l\u00e9portation en cours...
 teleportToPlayer=\u00a76T\u00e9l\u00e9portation vers \u00a7c{0}\u00a76.
 tempBanned=\u00a7cVous avez \u00e9t\u00e9 banni temporairement pour {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a77Vous ne pouvez pas bannir temporairement ce joueur.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=Vous avez {0} la foudre dans votre monde.
 thunderDuration=Vous avez {0} la foudre sur le serveur pendant {1} seconde(s).
 timeBeforeHeal=Temps avant le prochain soin \: {0}

Essentials/src/messages_hu.properties

@@ -443,6 +443,7 @@ teleporting=\u00a76Teleport\u00e1l\u00e1s...
 teleportToPlayer=\u00a76Teleport\u00e1l\u00e1s \u00a7c{0}\u00a76-hoz/hez.
 tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a74Nem tempbannolhatod ezt a szem\u00e9lyt.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a76You\u00a7c {0} \u00a76thunder in your world.
 thunderDuration=\u00a76You\u00a7c {0} \u00a76thunder in your world for\u00a7c {1} \u00a76seconds.
 timeBeforeHeal=\u00a74Time before next heal\:\u00a7c {0}\u00a76.

Essentials/src/messages_it.properties

@@ -449,6 +449,7 @@ teleporting=\u00a77Teletrasporto in corso...
 teleportToPlayer=\u00a76Teletrasportato a \u00a7c{0}\u00a76.
 tempBanned=\u00a7cSei stato temporaneamente bannato per {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a77Non puoi bannare questo giocatore.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=Abilita i fulmini dal cielo\: {0}
 thunderDuration=Abilita i fulmini dal cielo\: {0} per {1} secondi.
 timeBeforeHeal=Tempo rimanente prima della prossima cura\: {0}

Essentials/src/messages_ko.properties

@@ -443,6 +443,7 @@ teleporting=\u00a76\ud154\ub808\ud3ec\ud2b8 \uc911 \uc785\ub2c8\ub2e4...
 teleportToPlayer=\u00a7c{0}\u00a76\ub85c \uc774\ub3d9 \ud569\ub2c8\ub2e4.
 tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a74\ud574\ub2f9 \ud50c\ub808\uc774\uc5b4\ub97c \uc784\uc2dc \ucc28\ub2e8\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a76\ub2f9\uc2e0\uc740 \uc774 \uc6d4\ub4dc\uc758 \ucc9c\ub465\uc744 {0} \uc2dc\ucf30\uc2b5\ub2c8\ub2e4.
 thunderDuration=\u00a76\ub2f9\uc2e0\uc740 \uc774 \uc6d4\ub4dc\uc758 \ucc9c\ub465\uc744 {1}\ucd08 \ub3d9\uc548 {0} \uc2dc\ucf30\uc2b5\ub2c8\ub2e4.
 timeBeforeHeal=\u00a74\ub2e4\uc74c \ud68c\ubcf5\uae4c\uc9c0\uc758 \ud544\uc694\ud55c \uc2dc\uac04\: \u00a7c{0}\u00a76.

Essentials/src/messages_lt.properties

@@ -443,6 +443,7 @@ teleporting=\u00a76Teleportuojama...
 teleportToPlayer=\u00a76Teleportuojama pas \u00a7c{0}\u00a76.
 tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a74Tu negali u\u017eblokuoti \u0161io \u017eaid\u0117jo laikinai.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a76You\u00a7c {0} \u00a76thunder in your world.
 thunderDuration=\u00a76You\u00a7c {0} \u00a76thunder in your world for\u00a7c {1} \u00a76seconds.
 timeBeforeHeal=\u00a74Laikas iki kito pagydymo\:\u00a7c {0}\u00a76.

Essentials/src/messages_nl.properties

@@ -447,6 +447,7 @@ teleporting=\u00a76Bezig met teleporteren...
 teleportToPlayer=\u00a76Teleporteren naar \u00a7c{0}\u00a76.
 tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a74U kunt deze speler niet tijdelijk verbannen.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a76U heeft onweer\u00a7c {0} \u00a76in uw wereld.
 thunderDuration=\u00a76U heeft onweer \u00a7c{0}\u00a76 in uw wereld voor \u00a7c{1}\u00a76 seconde(n).
 timeBeforeHeal=\u00a74Afkoeltijd tot de volgende genezing\:\u00a7c {0}\u00a76.

Essentials/src/messages_pl.properties

@@ -443,6 +443,7 @@ teleporting=\u00a77Teleportacja...
 teleportToPlayer=\u00a76Teleportowanie do \u00a7c{0}\u00a76.
 tempBanned=\u00a7cZosta\u0142e\u015B tymczasowo zbanowany na {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a74Nie mo\u017Cesz tymczasowo zbanowa\u0107 tego gracza.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a7c{0} \u00a77przywo\u0142a\u0142 burz\u0119.
 thunderDuration=\u00a77Gracz \u00a7c{0} \u00a77przywo\u0142a\u0142 burz\u0119 na\u00a7c {1} \u00a77sekund.
 timeBeforeHeal=\u00a77Czas przed nast\u0119pnym uzdrowieniem\:\u00a7c {0}\u00a77.

Essentials/src/messages_pt.properties

@@ -443,6 +443,7 @@ teleporting=\u00A76Teletransportando...
 teleportToPlayer=\u00A76Teletransportando para \u00A76 \u00A7c {0}.
 tempBanned=\u00A7cFoste banido temporariamente por {0}:n\u00A7r{2}
 tempbanExempt=\u00A74N\u00E3o podes banir temporariamente esse jogador.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00A76Tu\u00A7c {0} \u00A76trovoada no teu mundo.
 thunderDuration=\u00A76Tu\u00A7c {0} \u00A76trovoada no teu mundo por\u00A7c {1} \u00A76segundos.
 timeBeforeHeal=\u00A76Tempo antes da pr\u00F3xima cura:\u00A7c {0}\u00A76.

Essentials/src/messages_pt_BR.properties

@@ -443,6 +443,7 @@ teleporting=\u00A76Teleportando...
 teleportToPlayer=\u00A76Teletransportando para \u00A76 \u00A7c {0}.
 tempBanned=\u00A7cVoc\u00EA foi banido temporariamente por {0}\:\n\u00A7r{2}
 tempbanExempt=\u00A74Voc\u00EA n\u00E3o pode banir temporariamente esse jogador.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00A76Voc\u00EA\u00A7c {0} \u00A76trovoada em seu mundo.
 thunderDuration=\u00A76Voc\u00EA\u00A7c {0} \u00A76trovoada em seu mundo por\u00A7c {1} \u00A76segundos.
 timeBeforeHeal=\u00A76Tempo antes da pr\u00F3xima cura\:\u00A7c {0}\u00A76.

Essentials/src/messages_ro.properties

@@ -443,6 +443,7 @@ teleporting=\u00a76Teleporteaza...
 teleportToPlayer=\u00a76Teleporting to \u00a7c{0}\u00a76.
 tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a74Nu poti interzice acest jucatoru.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a76Ai\u00a7c {0} \u00a76ploaia in lumea ta.
 thunderDuration=\u00a76Ai\u00a7c {0} \u00a76ploaia in luma ta pentru\u00a7c {1} \u00a76secunde.
 timeBeforeHeal=\u00a76Timp pana la urmatoarea vindecare\:\u00a7c {0}\u00a76.

Essentials/src/messages_ru.properties

@@ -443,6 +443,7 @@ teleporting=\u00a76\u0422\u0435\u043b\u0435\u043f\u043e\u0440\u0442\u0438\u0440\
 teleportToPlayer=\u00a76\u0422\u0435\u043b\u0435\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043a \u00a7c{0}\u00a76.
 tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a74\u0412\u044b \u043d\u0435 \u043c\u043e\u0436\u0435\u0442\u0435 \u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e \u0437\u0430\u0431\u0430\u043d\u0438\u0442\u044c \u044d\u0442\u043e\u0433\u043e \u0438\u0433\u0440\u043e\u043a\u0430.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a76\u0422\u044b\u00a7c {0} \u00a76\u0433\u0440\u043e\u0437\u0443 \u0432 \u0441\u0432\u043e\u0435\u043c \u043c\u0438\u0440\u0435.
 thunderDuration=\u00a76\u0412\u044b\u00a7c {0} \u00a76\u0433\u0440\u043e\u0437\u0443 \u0432 \u0441\u0432\u043e\u0435\u043c \u043c\u0438\u0440\u0435 \u043d\u0430\u00a7c {1} \u00a76\u0441\u0435\u043a\u0443\u043d\u0434.
 timeBeforeHeal=\u00a76\u0412\u0440\u0435\u043c\u0435\u043d\u0438 \u0434\u043e \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u0433\u043e \u043b\u0435\u0447\u0435\u043d\u0438\u044f\:\u00a7c {0}\u00a76.

Essentials/src/messages_sv.properties

@@ -443,6 +443,7 @@ teleporting=\u00a77Teleporterar...
 teleportToPlayer=\u00a76Teleporting to \u00a7c{0}\u00a76.
 tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a77Du kan inte tempor\u00e4rt banna den spelaren
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=Du {0} \u00e5ska i din v\u00e4rld
 thunderDuration=Du {0} i din v\u00e4rld i {1} sekunder.
 timeBeforeHeal=Tid f\u00f6re n\u00e4ste l\u00e4kning\: {0}

Essentials/src/messages_tr.properties

@@ -443,6 +443,7 @@ teleporting=\u00a76Isinlaniliyor...
 teleportToPlayer=\u00a76Su Kisiye Isinlaniyorsunuz\: \u00a7c{0}\u00a76.
 tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a74Bu Kisiye Sureli Yasaklama Koyamazsin\!
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a76Dunyanda simsek \u00a7c {0} .
 thunderDuration=\u00a76D\u00fcnyanda simsek \u00a7c {1} \u00a76sure boyunca \u00a7c {0}.
 timeBeforeHeal=\u00a74Bir Sonraki Canlandirma Icin\:\u00a7c {0}\u00a76 Beklemelisiniz.

Essentials/src/messages_zh.properties

@@ -449,6 +449,7 @@ teleporting=\u00a76\u6b63\u5728\u4f20\u9001...
 teleportToPlayer=\u00a76\u6b63\u5728\u4f20\u9001\u81f3 \u00a7c{0}\u00a76.
 tempBanned=\u00a7c\u4f60\u6682\u65f6\u88ab\u5c01\u7981\u4e86 {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a74\u4f60\u65e0\u6cd5\u4e34\u65f6\u5c01\u7981\u6389\u8be5\u73a9\u5bb6.
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a76\u4f60 \u00a7c{0} \u00a76\u4e86\u4f60\u7684\u4e16\u754c\u7684\u95ea\u7535
 thunderDuration=\u00a76\u4f60 \u00a7c{0} \u00a76\u4e86\u4f60\u7684\u4e16\u754c\u7684\u95ea\u7535\u00a7c {1} \u00a76\u79d2
 timeBeforeHeal=\u00a76\u6cbb\u7597\u51b7\u5374\:{0}

Essentials/src/messages_zh_HK.properties

@@ -443,6 +443,7 @@ teleporting=\u00a76\u6b63\u5728\u50b3\u9001...
 teleportToPlayer=\u00a76\u50b3\u9001\u5230 \u00a7c{0}\u00a76\u3002
 tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a76\u4f60\u7121\u6cd5\u81e8\u6642\u5c01\u7981\u6389\u8a72\u73a9\u5bb6
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a76\u4f60 \u00a7c{0} \u00a76\u4e86\u4f60\u7684\u4e16\u754c\u7684\u9583\u96fb
 thunderDuration=\u00a76\u4f60 \u00a7c{0} \u00a76\u4e86\u4f60\u7684\u4e16\u754c\u7684\u9583\u96fb\u00a7c {1} \u00a76\u79d2
 timeBeforeHeal=\u00a76\u6cbb\u7642\u51b7\u537b\:{0}

Essentials/src/messages_zh_TW.properties

@@ -443,6 +443,7 @@ teleporting=\u00a76\u6b63\u5728\u50b3\u9001...
 teleportToPlayer=\u00a76\u50b3\u9001\u5230 \u00a7c{0}\u00a76\u3002
 tempBanned=\u00a7cYou have been temporarily banned for {0}\:\n\u00a7r{2}
 tempbanExempt=\u00a76\u4f60\u7121\u6cd5\u81e8\u6642\u5c01\u7981\u6389\u8a72\u73a9\u5bb6
+tempbanJoin=You are banned from this server for {0}. Reason: {1}
 thunder=\u00a76\u4f60 \u00a7c{0} \u00a76\u4e86\u4f60\u7684\u4e16\u754c\u7684\u9583\u96fb
 thunderDuration=\u00a76\u4f60 \u00a7c{0} \u00a76\u4e86\u4f60\u7684\u4e16\u754c\u7684\u9583\u96fb\u00a7c {1} \u00a76\u79d2
 timeBeforeHeal=\u00a76\u6cbb\u7642\u51b7\u537b\:{0}