Implement rest command (#3205)

Implements a rest command based on @mart-r's suggestion in #2299. Resetting the time since rest statistic prevents phantoms from coming after you for an hour (real time). The statistic is also set to zero when using a bed. This command cannot be used pre-1.13 because the statistic does not exist (nor would it matter since there are no phantoms).

Closes #2299
This commit is contained in:
pop4959 2020-05-11 09:11:06 -07:00 committed by GitHub
parent 8b71437264
commit 8e3c1aaa96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 78 additions and 0 deletions

View File

@ -0,0 +1,72 @@
package com.earth2me.essentials.commands;
import com.earth2me.essentials.CommandSource;
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.VersionUtil;
import org.bukkit.Server;
import org.bukkit.Statistic;
import java.util.Collections;
import java.util.List;
import static com.earth2me.essentials.I18n.tl;
public class Commandrest extends EssentialsLoopCommand {
public Commandrest() {
super("rest");
}
@Override
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_13_0_R01)) {
user.sendMessage(tl("unsupportedFeature"));
return;
}
if (args.length > 0 && user.isAuthorized("essentials.rest.others")) {
loopOnlinePlayers(server, user.getSource(), true, true, args[0], null);
return;
}
restPlayer(user);
}
@Override
public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_13_0_R01)) {
sender.sendMessage(tl("unsupportedFeature"));
return;
}
if (args.length < 1) {
throw new NotEnoughArgumentsException();
}
loopOnlinePlayers(server, sender, true, true, args[0], null);
}
@Override
protected void updatePlayer(final Server server, final CommandSource sender, final User player, final String[] args) throws PlayerExemptException {
restPlayer(player);
sender.sendMessage(tl("restOther", player.getDisplayName()));
}
private void restPlayer(final User user) {
user.getBase().setStatistic(Statistic.TIME_SINCE_REST, 0);
user.sendMessage(tl("rest"));
}
@Override
protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
if (args.length == 1 && user.isAuthorized("essentials.rest.others")) {
return getPlayers(server, user);
} else {
return Collections.emptyList();
}
}
@Override
protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
if (args.length == 1) {
return getPlayers(server, sender);
} else {
return Collections.emptyList();
}
}
}

View File

@ -475,6 +475,8 @@ requestSentAlready=\u00a74You have already sent {0}\u00a74 a teleport request.
requestTimedOut=\u00a74Teleport request has timed out.
resetBal=\u00a76Balance has been reset to \u00a7c{0} \u00a76for all online players.
resetBalAll=\u00a76Balance has been reset to \u00a7c{0} \u00a76for all players.
rest=\u00a76You feel well rested.
restOther=\u00a76Resting\u00a7c {0}\u00a76.
returnPlayerToJailError=\u00a74Error occurred when trying to return player\u00a7c {0} \u00a74to jail\: \u00a7c{1}\u00a74\!
runningPlayerMatch=\u00a76Running search for players matching ''\u00a7c{0}\u00a76'' (this could take a little while).
second=second

View File

@ -360,6 +360,10 @@ commands:
description: Repairs the durability of one or all items.
usage: /<command> [hand|all]
aliases: [fix,efix,erepair]
rest:
description: Rests you or the given player.
usage: /<command> [player]
aliases: [erest]
rules:
description: Views the server rules.
usage: /<command> [chapter] [page]