Skip to content

Add offline user support to /playtime #4619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 6, 2021
Merged

Add offline user support to /playtime #4619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 24 additions & 13 deletions Essentials/src/main/java/com/earth2me/essentials/commands/Commandplaytime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -24,21 +24,32 @@ public Commandplaytime() {

@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
Expand Down
14 changes: 11 additions & 3 deletions Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,15 @@ public String getName() {

// 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
Expand All @@ -130,7 +134,11 @@ protected User getPlayer(final Server server, final CommandSource sender, final

// 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
Expand Down