mirror of
https://github.com/EssentialsX/Essentials.git
synced 2024-09-06 04:58:00 +02:00
Merge branch 'master' of https://github.com/essentials/Essentials
This commit is contained in:
commit
db27a8c627
@ -54,13 +54,20 @@ public class Commandhelp extends EssentialsCommand
|
||||
}
|
||||
|
||||
List<String> lines = getHelpLines(user, match);
|
||||
int start = (page - 1) * 9;
|
||||
int pages = lines.size() / 9 + (lines.size() % 9 > 0 ? 1 : 0);
|
||||
|
||||
user.sendMessage(Util.format("helpPages", page, pages));
|
||||
for (int i = start; i < lines.size() && i < start + 9; i++)
|
||||
if (lines.size() > 0)
|
||||
{
|
||||
user.sendMessage(lines.get(i));
|
||||
int start = (page - 1) * 9;
|
||||
int pages = lines.size() / 9 + (lines.size() % 9 > 0 ? 1 : 0);
|
||||
|
||||
user.sendMessage(Util.format("helpPages", page, pages));
|
||||
for (int i = start; i < lines.size() && i < start + 9; i++)
|
||||
{
|
||||
user.sendMessage(lines.get(i));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
user.sendMessage(Util.i18n("noHelpFound"));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -20,12 +20,16 @@ public class Commandtempban extends EssentialsCommand
|
||||
{
|
||||
throw new NotEnoughArgumentsException();
|
||||
}
|
||||
|
||||
final User player = getPlayer(server, args, 0, true);
|
||||
if (player.isAuthorized("essentials.tempban.exempt"))
|
||||
{
|
||||
sender.sendMessage(Util.i18n("tempbanExempt"));
|
||||
return;
|
||||
}
|
||||
final String time = getFinalArg(args, 1);
|
||||
final long banTimestamp = Util.parseDateDiff(time, true);
|
||||
|
||||
final String banReason = Util.format("tempBanned", Util.formatDateDiff(banTimestamp));
|
||||
final String banReason = (args.length == 3 && !args[2].isEmpty()) ? args[2].toString() + " - " + Util.formatDateDiff(banTimestamp) : Util.format("tempBanned", Util.formatDateDiff(banTimestamp));
|
||||
player.setBanReason(banReason);
|
||||
player.setBanTimeout(banTimestamp);
|
||||
player.kickPlayer(banReason);
|
||||
|
@ -256,6 +256,7 @@ teleportationEnabled = \u00a77Teleportation enabled.
|
||||
teleporting = \u00a77Teleporting...
|
||||
teleportingPortal = \u00a77Teleporting via portal.
|
||||
tempBanned = Temporarily banned from server for {0}
|
||||
tempbanExempt = \u00a77You may not tempban that player
|
||||
thunder = You {0} thunder in your world
|
||||
thunderDuration = You {0} thunder in your world for {1} seconds.
|
||||
timeBeforeHeal = Time before next heal: {0}
|
||||
|
@ -258,6 +258,7 @@ teleportationEnabled = \u00a77Teleportering aktiveret.
|
||||
teleporting = \u00a77Teleportere...
|
||||
teleportingPortal = \u00a77Teleporterede via portal.
|
||||
tempBanned = Midlertidigt bannet fra serveren for {0}
|
||||
tempbanExempt = \u00a77You may not tempban that player
|
||||
thunder = Du {0} torden i din verden
|
||||
thunderDuration = Du {0} torden i din verden i {1} sekunder.
|
||||
timeBeforeHeal = Tid inden n\u00e6ste helbredelse: {0}
|
||||
|
@ -256,6 +256,7 @@ teleportationEnabled = \u00a77Teleportierung aktiviert.
|
||||
teleporting = \u00a77Teleportiere...
|
||||
teleportingPortal = \u00a77Teleportiere durch Portal.
|
||||
tempBanned = Zeitlich gesperrt vom Server f\u00fcr {0}
|
||||
tempbanExempt = \u00a77You may not tempban that player
|
||||
thunder = Du hast Donner in deiner Welt {0}.
|
||||
thunderDuration = Du hast Donner in deiner Welt {0} f\u00fcr {1} Sekunden.
|
||||
timeBeforeHeal = Zeit bis zur n\u00e4chsten Heilung: {0}
|
||||
|
@ -182,6 +182,7 @@ nickSet = \u00a77Your nickname is now \u00a7c{0}
|
||||
noAccessCommand = \u00a7cYou do not have access to that command.
|
||||
noAccessPermission = \u00a7cYou do not have permission to access that {0}.
|
||||
noDestroyPermission = \u00a7cYou do not have permission to destroy that {0}.
|
||||
noHelpFound = \u00a7cNo matching commands.
|
||||
noHomeSet = You have not set a home.
|
||||
noHomeSetPlayer = Player has not set a home.
|
||||
noKitPermission = \u00a7cYou need the \u00a7c{0}\u00a7c permission to use that kit.
|
||||
@ -256,6 +257,7 @@ teleportationEnabled = \u00a77Teleportation enabled.
|
||||
teleporting = \u00a77Teleporting...
|
||||
teleportingPortal = \u00a77Teleporting via portal.
|
||||
tempBanned = Temporarily banned from server for {0}
|
||||
tempbanExempt = \u00a77You may not tempban that player
|
||||
thunder = You {0} thunder in your world
|
||||
thunderDuration = You {0} thunder in your world for {1} seconds.
|
||||
timeBeforeHeal = Time before next heal: {0}
|
||||
|
@ -256,6 +256,7 @@ teleportationEnabled = \u00a77T\u00e9l\u00e9portation activ\u00e9e.
|
||||
teleporting = \u00a77T\u00e9l\u00e9poration en cours...
|
||||
teleportingPortal = \u00a77T\u00e9l\u00e9portation via portail.
|
||||
tempBanned = Banni temporairement du serveur pour {0}
|
||||
tempbanExempt = \u00a77You may not tempban that player
|
||||
thunder = Vous avez {0} la foudre dans votre monde.
|
||||
thunderDuration = Vous avez {0} la foudre dans le serveur {1} secondes.
|
||||
timeBeforeHeal = Temps avant le prochain soin : {0}
|
||||
|
@ -257,6 +257,7 @@ teleportationEnabled = \u00a77Teleportatie ingeschakeld.
|
||||
teleporting = \u00a77Bezig met teleporteren...
|
||||
teleportingPortal = \u00a77Bezig met teleporteren via de portal.
|
||||
tempBanned = Tijdelijk geband voor {0}
|
||||
tempbanExempt = \u00a77You may not tempban that player
|
||||
thunder = Je {0} onweert de wereld
|
||||
thunderDuration = Je {0} onweert de wereld voor {1} seconde.
|
||||
timeBeforeHeal = Afkoeltijd tot de volgende heal: {0}
|
||||
|
@ -30,7 +30,7 @@ commands:
|
||||
balancetop:
|
||||
description: Gets the top x balance values. (max 10)
|
||||
usage: /<command> <max>
|
||||
aliases:
|
||||
aliases: [baltop,ebaltop,ebalancetop]
|
||||
ban:
|
||||
description: Bans a player.
|
||||
usage: /<command> [player] <reason>
|
||||
@ -58,6 +58,7 @@ commands:
|
||||
compass:
|
||||
description: Describes your current bearing.
|
||||
usage: /<command>
|
||||
aliases: [ecompass]
|
||||
deljail:
|
||||
description: Removes a jail
|
||||
usage: /<command> [jailname]
|
||||
@ -80,7 +81,7 @@ commands:
|
||||
ext:
|
||||
description: Extinguish players.
|
||||
usage: /<command> <player>
|
||||
aliases: [extinguish]
|
||||
aliases: [extinguish,eext,eextinguish]
|
||||
fireball:
|
||||
description: Throw a fireball.
|
||||
usage: /<command>
|
||||
@ -162,6 +163,7 @@ commands:
|
||||
lightning:
|
||||
description: The power of Thor. Strike at cursor or player.
|
||||
usage: /<command> [player]
|
||||
aliases: [strike,elightning,estrike]
|
||||
mail:
|
||||
description: Manages inter-player, intra-server mail.
|
||||
usage: /<command> [read|clear|send [to] [message]]
|
||||
@ -205,7 +207,7 @@ commands:
|
||||
r:
|
||||
description: Quickly reply to the last player to message you.
|
||||
usage: /<command> [message]
|
||||
aliases: [er]
|
||||
aliases: [er,reply,ereply]
|
||||
realname:
|
||||
description: Displays the username of a user based on nickname.
|
||||
usage: /<command> [nickname]
|
||||
|
Loading…
Reference in New Issue
Block a user