TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-07-02 10:43:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.9' of https://github.com/essentials/Essentials.git into 2.9

Browse source
This commit is contained in:
Iaccidentally 2013-02-12 18:38:35 -05:00
parent ec8c778f68 56df6b36a5
commit 44a6f4d562
16 changed files with 55 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View file

@ -442,7 +442,7 @@ public class EssentialsPlayerListener implements Listener
if (player.isAuthorized("essentials.sethome.bed"))
{
player.setBedSpawnLocation(event.getClickedBlock().getLocation());
player.sendMessage(_("homeSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
player.sendMessage(_("bedSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
}
}
break;

15
Essentials/src/com/earth2me/essentials/commands/Commandhome.java
View file

@ -52,6 +52,10 @@ public class Commandhome extends EssentialsCommand
user.getTeleport().teleport(bed, charge, TeleportCause.COMMAND);
throw new NoChargeException();
}
else
{
throw new Exception(_("bedMissing"));
}
}
goHome(user, player, homeName.toLowerCase(Locale.ENGLISH), charge);
}
@ -73,9 +77,16 @@ public class Commandhome extends EssentialsCommand
}
else
{
if (bed != null && user.isAuthorized("essentials.home.bed"))
if (user.isAuthorized("essentials.home.bed"))
{
homes.add(_("bed"));
if (bed != null)
{
homes.add(_("bed"));
}
else
{
homes.add(_("bedNull"));
}
}
user.sendMessage(_("homes", Util.joinList(homes)));
}

3
Essentials/src/messages.properties
View file

@ -498,5 +498,8 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond.
fireworkEffectsCleared=\u00a76Removed all effects from held stack.
fireworkSyntax=\u00a76Firework parameters:\u00a7c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle.
bed=\u00a7obed\u00a7r
bedNull=\u00a7mbed\u00a7r
bedMissing=\u00a74Your bed is either unset, missing or blocked.
bedSet=\u00a76Bed spawn set!
kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7.
kitReceive=\u00a76Received kit\u00a7c {0}\u00a76.

3
Essentials/src/messages_cs.properties
View file

@ -501,5 +501,8 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond
fireworkEffectsCleared=\u00a76Removed all effects from held stack.
fireworkSyntax=\u00a76Firework parameters:\u00a7c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle
bed=\u00a7obed\u00a7r
bedNull=\u00a7mbed\u00a7r
bedMissing=\u00a74Your bed is either unset, missing or blocked.
bedSet=\u00a76Bed spawn set!
kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7.
kitReceive=\u00a76Received kit\u00a7c {0}\u00a76.

3
Essentials/src/messages_da.properties
View file

@ -498,5 +498,8 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond
fireworkEffectsCleared=\u00a76Removed all effects from held stack.
fireworkSyntax=\u00a76Firework parameters:\u00a7c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle
bed=\u00a7obed\u00a7r
bedNull=\u00a7mbed\u00a7r
bedMissing=\u00a74Your bed is either unset, missing or blocked.
bedSet=\u00a76Bed spawn set!
kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7.
kitReceive=\u00a76Received kit\u00a7c {0}\u00a76.

3
Essentials/src/messages_de.properties
View file

@ -498,5 +498,8 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond
fireworkEffectsCleared=\u00a76Removed all effects from held stack.
fireworkSyntax=\u00a76Firework parameters:\u00a7c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle
bed=\u00a7obed\u00a7r
bedNull=\u00a7mbed\u00a7r
bedMissing=\u00a74Your bed is either unset, missing or blocked.
bedSet=\u00a76Bed spawn set!
kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7.
kitReceive=\u00a76Received kit\u00a7c {0}\u00a76.

3
Essentials/src/messages_en.properties
View file

@ -498,5 +498,8 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond.
fireworkEffectsCleared=\u00a76Removed all effects from held stack.
fireworkSyntax=\u00a76Firework parameters:\u00a7c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle.
bed=\u00a7obed\u00a7r
bedNull=\u00a7mbed\u00a7r
bedMissing=\u00a74Your bed is either unset, missing or blocked.
bedSet=\u00a76Bed spawn set!
kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7.
kitReceive=\u00a76Received kit\u00a7c {0}\u00a76.

3
Essentials/src/messages_es.properties
View file

@ -498,5 +498,8 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond
fireworkEffectsCleared=\u00a76Removed all effects from held stack.
fireworkSyntax=\u00a76Firework parameters:\u00a7c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle
bed=\u00a7obed\u00a7r
bedNull=\u00a7mbed\u00a7r
bedMissing=\u00a74Your bed is either unset, missing or blocked.
bedSet=\u00a76Bed spawn set!
kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7.
kitReceive=\u00a76Received kit\u00a7c {0}\u00a76.

3
Essentials/src/messages_fi.properties
View file

@ -498,5 +498,8 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond
fireworkEffectsCleared=\u00a76Removed all effects from held stack.
fireworkSyntax=\u00a76Firework parameters:\u00a7c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle
bed=\u00a7obed\u00a7r
bedNull=\u00a7mbed\u00a7r
bedMissing=\u00a74Your bed is either unset, missing or blocked.
bedSet=\u00a76Bed spawn set!
kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7.
kitReceive=\u00a76Received kit\u00a7c {0}\u00a76.

3
Essentials/src/messages_fr.properties
View file

@ -498,5 +498,8 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond
fireworkEffectsCleared=\u00a76Removed all effects from held stack.
fireworkSyntax=\u00a76Firework parameters:\u00a7c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle
bed=\u00a7obed\u00a7r
bedNull=\u00a7mbed\u00a7r
bedMissing=\u00a74Your bed is either unset, missing or blocked.
bedSet=\u00a76Bed spawn set!
kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7.
kitReceive=\u00a76Received kit\u00a7c {0}\u00a76.

3
Essentials/src/messages_it.properties
View file

@ -498,5 +498,8 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond
fireworkEffectsCleared=\u00a76Removed all effects from held stack.
fireworkSyntax=\u00a76Firework parameters:\u00a7c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle
bed=\u00a7obed\u00a7r
bedNull=\u00a7mbed\u00a7r
bedMissing=\u00a74Your bed is either unset, missing or blocked.
bedSet=\u00a76Bed spawn set!
kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7.
kitReceive=\u00a76Received kit\u00a7c {0}\u00a76.

3
Essentials/src/messages_nl.properties
View file

@ -498,5 +498,8 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond
fireworkEffectsCleared=\u00a76Removed all effects from held stack.
fireworkSyntax=\u00a76Firework parameters:\u00a7c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle
bed=\u00a7obed\u00a7r
bedNull=\u00a7mbed\u00a7r
bedMissing=\u00a74Your bed is either unset, missing or blocked.
bedSet=\u00a76Bed spawn set!
kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7.
kitReceive=\u00a76Received kit\u00a7c {0}\u00a76.

3
Essentials/src/messages_pl.properties
View file

@ -498,5 +498,8 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond
fireworkEffectsCleared=\u00a76Removed all effects from held stack.
fireworkSyntax=\u00a76Firework parameters:\u00a7c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle
bed=\u00a7obed\u00a7r
bedNull=\u00a7mbed\u00a7r
bedMissing=\u00a74Your bed is either unset, missing or blocked.
bedSet=\u00a76Bed spawn set!
kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7.
kitReceive=\u00a76Received kit\u00a7c {0}\u00a76.

3
Essentials/src/messages_pt.properties
View file

@ -498,5 +498,8 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond
fireworkEffectsCleared=\u00a76Removed all effects from held stack.
fireworkSyntax=\u00a76Firework parameters:\u00a7c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle
bed=\u00a7obed\u00a7r
bedNull=\u00a7mbed\u00a7r
bedMissing=\u00a74Your bed is either unset, missing or blocked.
bedSet=\u00a76Bed spawn set!
kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7.
kitReceive=\u00a76Received kit\u00a7c {0}\u00a76.

3
Essentials/src/messages_se.properties
View file

@ -498,5 +498,8 @@ userAFK=\u00a75{0} \u00a75\u00c3\u00a4r f\u00c3\u00b6r n\u00c3\u00a4rvarande bor
fireworkEffectsCleared=\u00a76Removed all effects from held stack.
fireworkSyntax=\u00a76Firework parameters:\u00a7c color:<color> [fade:<color>] [shape:<shape>] [effect:<effect>]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle
bed=\u00a7obed\u00a7r
bedNull=\u00a7mbed\u00a7r
bedMissing=\u00a74Your bed is either unset, missing or blocked.
bedSet=\u00a76Bed spawn set!
kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7.
kitReceive=\u00a76Received kit\u00a7c {0}\u00a76.

4
Essentials/src/plugin.yml
View file

@ -137,7 +137,7 @@ commands:
aliases: [coords,egetpos,position,eposition,whereami,ewhereami]
give:
description: Give a player an item.
usage: /<command> <player> <item|numeric> [amount <enchantmentname[:level]> ...]
usage: /<command> <player> <item|numeric> [amount [itemmeta...]]
aliases: [egive]
god:
description: Enables your godly powers.
@ -177,7 +177,7 @@ commands:
aliases: [einvsee]
item:
description: Spawn an item.
usage: /<command> <item|numeric> [amount <enchantmentname[:level]> ...]
usage: /<command> <item|numeric> [amount [itemmeta...]]
aliases: [i,eitem]
itemdb:
description: Searches for an item.