Display name of new world on world change

12 files changed, 26 insertions, 10 deletions

diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index 604703770..38243cf76 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -319,17 +319,22 @@ public class EssentialsPlayerListener implements Listener
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void onPlayerChangedWorld(final PlayerChangedWorldEvent event)
 	{
-		final User user = ess.getUser(event.getPlayer());
+		final User user = ess.getUser(event.getPlayer());		
+		final String newWorld = event.getPlayer().getLocation().getWorld().getName();
 		user.setDisplayNick();
 		updateCompass(user);
-
-		if (ess.getSettings().getNoGodWorlds().contains(event.getPlayer().getLocation().getWorld().getName()))
+		if (ess.getSettings().getNoGodWorlds().contains(newWorld))
 		{
 			if (user.isGodModeEnabledRaw())
 			{
 				user.sendMessage(_("noGodWorldWarning"));
 			}
 		}
+		
+		if(!event.getPlayer().getWorld().getName().equals(newWorld))
+		{
+			user.sendMessage(_("currentWorld", newWorld));
+		}
 	}
 
 	@EventHandler(priority = EventPriority.NORMAL)
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index df0706ea8..92e436f0b 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -51,6 +51,7 @@ creatingConfigFromTemplate=Creating config from template: {0}
 creatingEmptyConfig=Creating empty config: {0}
 creative=creative
 currency={0}{1}
+currentWorld=Current World: {0}
 day=day
 days=days
 defaultBanReason=The Ban Hammer has spoken!
diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties
index aceb622ee..85364f185 100644
--- a/Essentials/src/messages_cs.properties
+++ b/Essentials/src/messages_cs.properties
@@ -51,6 +51,7 @@ creatingConfigFromTemplate=Vytvari se nastaveni podle sablony: {0}
 creatingEmptyConfig=Vytvari se prazdne nastaveni: {0}
 creative=kreativ
 currency={0}{1}
+currentWorld=Current World: {0}
 day=den
 days=dny
 defaultBanReason=Ban promluvil!
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index e06985430..a76027543 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -51,6 +51,7 @@ creatingConfigFromTemplate=Opretter config fra skabelon: {0}
 creatingEmptyConfig=Opretter tom config: {0}
 creative=creative
 currency={0}{1}
+currentWorld=Current World: {0}
 day=dag
 days=dage
 defaultBanReason=Banhammeren har talt!
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index 4e4f7e78d..b03c91067 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -51,6 +51,7 @@ creatingConfigFromTemplate=Erstelle Konfiguration aus Vorlage: {0}
 creatingEmptyConfig=Erstelle leere Konfiguration: {0}
 creative=creative
 currency={0}{1}
+currentWorld=Current World: {0}
 day=Tag
 days=Tage
 defaultBanReason=Der Bann-Hammer hat gesprochen!
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 34367f115..20e6e6a12 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -51,6 +51,7 @@ creatingConfigFromTemplate=Creating config from template: {0}
 creatingEmptyConfig=Creating empty config: {0}
 creative=creative
 currency={0}{1}
+currentWorld=Current World: {0}
 day=day
 days=days
 defaultBanReason=The Ban Hammer has spoken!
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index ad1aefe6c..c0f15256b 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -51,6 +51,7 @@ creatingConfigFromTemplate=Creando configuracion desde el template: {0}
 creatingEmptyConfig=Creando configuracion vacia: {0}
 creative=creative
 currency={0}{1}
+currentWorld=Current World: {0}
 day=dia
 days=dias
 defaultBanReason=Baneado por incumplir las normas!
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 0c4b94efc..a7946d3e2 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -51,6 +51,7 @@ creatingConfigFromTemplate=Cr\u00e9ation de la configuration \u00e0 partir du mo
 creatingEmptyConfig=Cr\u00e9ation d''une configuration vierge : {0}
 creative=cr\u00e9atif
 currency={0}{1}
+currentWorld=Current World: {0}
 day=jour
 days=jours
 defaultBanReason=Le marteau du bannissement a frapp\u00e9 !
diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties
index ee7511cb4..c27366cea 100644
--- a/Essentials/src/messages_it.properties
+++ b/Essentials/src/messages_it.properties
@@ -51,6 +51,7 @@ creatingConfigFromTemplate=Configurazione dal template: {0}
 creatingEmptyConfig=Configurazione vuota creata: {0}
 creative=creativo
 currency={0}{1}
+currentWorld=Current World: {0}
 day=giorno
 days=giorni
 defaultBanReason=Sei stato bannato!
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index d0f56752b..ac80cca70 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -51,6 +51,7 @@ creatingConfigFromTemplate=Bezig met aanmaken van een config vanaf sjabloon: {0}
 creatingEmptyConfig=Bezig met een lege config aanmaken: {0}
 creative=creative
 currency={0}{1}
+currentWorld=Current World: {0}
 day=dag
 days=dagen
 defaultBanReason=De Ban Hamer heeft gesproken!
diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties
index 803b1d1f1..e4666cdda 100644
--- a/Essentials/src/messages_pl.properties
+++ b/Essentials/src/messages_pl.properties
@@ -51,6 +51,7 @@ creatingConfigFromTemplate=Creating config from template: {0}
 creatingEmptyConfig=Stworzono pusty config: {0}
 creative=Tworczy
 currency={0}{1}
+currentWorld=Current World: {0}
 day=dzien
 days=dnie
 defaultBanReason=Admin ma zawsze racje!
@@ -92,7 +93,7 @@ failedToWriteConfig=Blad podczas pisania configu {0}
 false=falsz
 feed=\u00a77Twoj glod zostal zaspokojony.
 feedOther=\u00a77Nakarmiono {0}.
-fileRenameError=Blad podczas zmiany nazwy pliku “{0}”.
+fileRenameError=Blad podczas zmiany nazwy pliku \u0093{0}\u0094.
 flyMode=\u00a77Latanie {0} dla {1}.
 foreverAlone=\u00a7cNie masz komu odpisac.
 freedMemory=Zwolniono {0} MB.
@@ -111,7 +112,7 @@ godMode=\u00a77Godmode {0}.
 haveBeenReleased=\u00a77Zostales wypuszczony.
 heal=\u00a77Uleczony
 healOther=\u00a77Uleczono {0}.
-helpConsole=Aby uzyskac pomoc z konsoli, wpisz “????.
+helpConsole=Aby uzyskac pomoc z konsoli, wpisz \u0093????.
 helpFrom=\u00a77Komendy od {0}:
 helpLine=\u00a76/{0}\u00a7f: {1}
 helpMatching=\u00a77Komendy odpowiadajace "{0}":
@@ -128,7 +129,7 @@ ignorePlayer=Od tej chwili ignorujesz gracza {0}.
 illegalDate=Illegal date format.
 infoChapter=Wybierz rozdzial:
 infoChapterPages=Rozdzial {0}, strona \u00a7c{1}\u00a7f z \u00a7c{2}\u00a7f:
-infoFileDoesNotExist=Plik “info.txt” nie istnieje. Tworzenie tego pliku.
+infoFileDoesNotExist=Plik \u0093info.txt\u0094 nie istnieje. Tworzenie tego pliku.
 infoPages=\u00a7e ---- \u00a76{2} \u00a7e--\u00a76 Page \u00a74{0}\u00a76/\u00a74{1} \u00a7e----
 infoUnknownChapter=Nieznany rozdzial.
 invBigger=Ekwipunek innego gracza jest wiekszy niz Twoj.
@@ -154,13 +155,13 @@ itemSold=\u00a77Sprzedamo za  \u00a7c{0} \u00a77({1} {2} po {3} kazdy)
 itemSoldConsole={0} Sprzedano {1}  za \u00a77{2} \u00a77({3} sztuki po {4} kazda)
 itemSpawn=\u00a77Otrzymywanie {0} {1}
 itemsCsvNotLoaded=Nie mozna wczytac items.csv.
-jailAlreadyIncarcerated=\u00a7cTen gracz jest juz w wiezieniu “{0}”.
+jailAlreadyIncarcerated=\u00a7cTen gracz jest juz w wiezieniu \u0093{0}\u0094.
 jailMessage=\u00a7cZa kazde przewinienie czeka kara.
 jailNotExist=Nie ma takiego wiezienia..
 jailReleased=\u00a77Gracz \u00a7e{0}\u00a77 wypuszczony z wiezienia.
 jailReleasedPlayerNotify=\u00a77Zostales zwolniony!
 jailSentenceExtended=Czas pobyty w wiezieniu zwiekszony do: {0)
-jailSet=\u00a77Zostalo stworzone wiezienie “{0}”.
+jailSet=\u00a77Zostalo stworzone wiezienie \u0093{0}\u0094.
 jumpError=That would hurt your computer''s brain.
 kickDefault=Zostales wyproszony  z serwera.
 kickExempt=\u00a7cNie mozesz wyprosic tej osoby.
@@ -212,7 +213,7 @@ mutedUserSpeaks={0} probowal sie odezwac, ale jest wyciszony.
 nearbyPlayers=Gracze w poblizu: {0}
 negativeBalanceError=Gracz nie moze miec ujemnego stanu konta.
 nickChanged=Nick zmieniony.
-nickDisplayName=\u00a77Musisz wlaczyc “change-displayname” w configu Essential.
+nickDisplayName=\u00a77Musisz wlaczyc \u0093change-displayname\u0094 w configu Essential.
 nickInUse=\u00a7cTen nick jest juz w uzyciu.
 nickNamesAlpha=\u00a7cNicki musza byc alfanumeryczne.
 nickNoMore=\u00a77Nie masz juz nicku.
@@ -265,7 +266,7 @@ parseError=Blad skladniowy {0} w linii {1}.
 pendingTeleportCancelled=\u00a7cOczekujace zapytanie teleportacji odrzucone.
 permissionsError=Brakuje Permissions/GroupManager;  prefixy/suffixy czatu zostana wylaczone.
 playerBanned=\u00a7c{0} zbanowal {1} za {2}.
-playerInJail=\u00a7cGracz jest juz w wiezieniu “{0}”.
+playerInJail=\u00a7cGracz jest juz w wiezieniu \u0093{0}\u0094.
 playerJailed=\u00a77Gracz {0} wtracony do wiezienia.
 playerJailedFor= \u00a77Gracz {0} wtracony do wiezienia na {1}.
 playerKicked=\u00a7c{0} wywalil {1} za {2}.
diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties
index 674eeda1e..4f3de9c36 100644
--- a/Essentials/src/messages_pt.properties
+++ b/Essentials/src/messages_pt.properties
@@ -51,6 +51,7 @@ creatingConfigFromTemplate=Criando arquivo de configura\u00e7ao com o modelo: {0
 creatingEmptyConfig=Criando arquivo de configura\u00e7ao vazio: {0}
 creative=creative
 currency={0}{1}
+currentWorld=Current World: {0}
 day=dia
 days=dias
 defaultBanReason=O martelo proibicao falou!