Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-09-20 20:11:01 +02:00
Code Issues Projects Releases Wiki Activity

Add offline user support to /playtime (#4619)

Browse Source
This commit is contained in:
Josh Roy 2021-11-06 18:41:38 -04:00 committed by GitHub
parent 86d435eee1
commit 8f679de352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Essentials/src/main/java/com/earth2me/essentials/commands/Commandplaytime.java
View File

@ -1,17 +1,17 @@
package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n.tl;
import com.earth2me.essentials.CommandSource;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.EnumUtil;
import net.ess3.api.IUser;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.Statistic;
import java.util.Collections;
import java.util.List;
import org.bukkit.Server;
import org.bukkit.Statistic;
import com.earth2me.essentials.CommandSource;
import com.earth2me.essentials.IUser;
import com.earth2me.essentials.utils.DateUtil;
import com.earth2me.essentials.utils.EnumUtil;
import static com.earth2me.essentials.I18n.tl;
public class Commandplaytime extends EssentialsCommand {
// For some reason, in 1.13 PLAY_ONE_MINUTE = ticks played = what used to be PLAY_ONE_TICK
@ -24,21 +24,32 @@ public class Commandplaytime extends EssentialsCommand {
@Override
protected void run(Server server, CommandSource sender, String commandLabel, String[] args) throws Exception {
final IUser target;
String displayName;
long playtime;
final String key;
if (args.length > 0 && sender.isAuthorized("essentials.playtime.others", ess)) {
target = getPlayer(server, sender, args, 0);
try {
final IUser user = getPlayer(server, sender, args, 0);
displayName = user.getDisplayName();
playtime = user.getBase().getStatistic(PLAY_ONE_TICK);
} catch (PlayerNotFoundException ignored) {
final IUser user = getPlayer(server, sender, args, 0, true);
displayName = user.getName();
playtime = Bukkit.getOfflinePlayer(user.getBase().getUniqueId()).getStatistic(PLAY_ONE_TICK);
}
key = "playtimeOther";
} else if (sender.isPlayer()) {
target = sender.getUser(ess);
//noinspection ConstantConditions
displayName = sender.getPlayer().getDisplayName();
playtime = sender.getPlayer().getStatistic(PLAY_ONE_TICK);
key = "playtime";
} else {
throw new NotEnoughArgumentsException();
}
final long playtimeMs = System.currentTimeMillis() - (target.getBase().getStatistic(PLAY_ONE_TICK) * 50);
sender.sendMessage(tl(key, DateUtil.formatDateDiff(playtimeMs), target.getDisplayName()));
final long playtimeMs = System.currentTimeMillis() - (playtime * 50L);
sender.sendMessage(tl(key, DateUtil.formatDateDiff(playtimeMs), displayName));
}
@Override

14
Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsCommand.java
View File

@ -112,11 +112,15 @@ public abstract class EssentialsCommand implements IEssentialsCommand {
// Get online players - only show vanished if source has permission
protected User getPlayer(final Server server, final CommandSource sender, final String[] args, final int pos) throws PlayerNotFoundException, NotEnoughArgumentsException {
return getPlayer(server, sender, args, pos, false);
}
protected User getPlayer(final Server server, final CommandSource sender, final String[] args, final int pos, final boolean getOffline) throws PlayerNotFoundException, NotEnoughArgumentsException {
if (sender.isPlayer()) {
final User user = ess.getUser(sender.getPlayer());
return getPlayer(server, user, args, pos);
return getPlayer(server, user, args, pos, getOffline);
}
return getPlayer(server, args, pos, true, false);
return getPlayer(server, args, pos, true, getOffline);
}
// Get online players - only show vanished if source has permission
@ -130,7 +134,11 @@ public abstract class EssentialsCommand implements IEssentialsCommand {
// Get online players - only show vanished if source has permission
protected User getPlayer(final Server server, final User user, final String[] args, final int pos) throws PlayerNotFoundException, NotEnoughArgumentsException {
return getPlayer(server, user, args, pos, user.canInteractVanished(), false);
return getPlayer(server, user, args, pos, false);
}
protected User getPlayer(final Server server, final User user, final String[] args, final int pos, final boolean getOffline) throws PlayerNotFoundException, NotEnoughArgumentsException {
return getPlayer(server, user, args, pos, user.canInteractVanished(), getOffline);
}
// Get online or offline players, this method allows for raw access