diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandback.java b/Essentials/src/com/earth2me/essentials/commands/Commandback.java index 6943ab802..1dedafd9e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandback.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandback.java @@ -16,6 +16,10 @@ public class Commandback extends EssentialsCommand @Override protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { + if (user.getLastLocation() == null) + { + throw new Exception(_("noLocationFound")); + } if (user.getWorld() != user.getLastLocation().getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + user.getLastLocation().getWorld().getName())) { diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index 71cc76d2e..2440392c7 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties index 51f201f25..26250a1ed 100644 --- a/Essentials/src/messages_cs.properties +++ b/Essentials/src/messages_cs.properties @@ -528,3 +528,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties index 54fd1af66..60e07bfdc 100644 --- a/Essentials/src/messages_da.properties +++ b/Essentials/src/messages_da.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index 898546045..79b407e11 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index 71cc76d2e..2440392c7 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties index 5e917ee95..06d0b68d5 100644 --- a/Essentials/src/messages_es.properties +++ b/Essentials/src/messages_es.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties index 9d893c8d1..8d4792ecc 100644 --- a/Essentials/src/messages_fi.properties +++ b/Essentials/src/messages_fi.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties index 72bb045e9..41ec3bf8d 100644 --- a/Essentials/src/messages_fr.properties +++ b/Essentials/src/messages_fr.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties index eb6566015..fba0b9884 100644 --- a/Essentials/src/messages_it.properties +++ b/Essentials/src/messages_it.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index 522778ebf..6df697311 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties index c575a0a29..93f92854c 100644 --- a/Essentials/src/messages_pl.properties +++ b/Essentials/src/messages_pl.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties index 5da69e298..153e105f1 100644 --- a/Essentials/src/messages_pt.properties +++ b/Essentials/src/messages_pt.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties index 4bd05620b..f0ebbc564 100644 --- a/Essentials/src/messages_ro.properties +++ b/Essentials/src/messages_ro.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_ru.properties b/Essentials/src/messages_ru.properties index 066ffb957..e0850d50b 100644 --- a/Essentials/src/messages_ru.properties +++ b/Essentials/src/messages_ru.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_sv.properties b/Essentials/src/messages_sv.properties index 46fd36252..4fb3ca1f3 100644 --- a/Essentials/src/messages_sv.properties +++ b/Essentials/src/messages_sv.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties index 06a11b010..44ad49f1d 100644 --- a/Essentials/src/messages_zh.properties +++ b/Essentials/src/messages_zh.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties index 098c0e451..4a63fa828 100644 --- a/Essentials/src/messages_zh_HK.properties +++ b/Essentials/src/messages_zh_HK.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found. diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties index c4a980761..597c77c8d 100644 --- a/Essentials/src/messages_zh_TW.properties +++ b/Essentials/src/messages_zh_TW.properties @@ -523,3 +523,4 @@ radiusTooBig=\u00a74Radius is too big\! Maximum radius is {0}. isIpBanned=\u00a76IP \u00a7c{0} \u00a76is banned. mobDataList=\u00a76Valid mob data\:\u00a7r {0} vanish=\u00a76Vanish for {0}\u00a76\: {1} +noLocationFound=\u00a74No valid location found.