Skip to content

Fix issue where offline players were prioritized in getPlayer() #34

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
sshshark merged 1 commit into from
Mar 24, 2025
Merged

Fix issue where offline players were prioritized in getPlayer() #34

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
29 changes: 20 additions & 9 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
@@ -1,13 +1,18 @@
package com.earth2me.essentials.commands;

import com.earth2me.essentials.*;
import java.util.List;
import java.util.logging.Logger;

import org.bukkit.Server;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

import java.util.List;
import java.util.logging.Logger;
import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.OfflinePlayer;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User;
import com.earth2me.essentials.Util;


public abstract class EssentialsCommand implements IEssentialsCommand {
Expand Down Expand Up @@ -46,13 +51,19 @@ protected User getPlayer(final Server server, final String[] args, final int pos
if (args.length <= pos) {
throw new NotEnoughArgumentsException();
}

final User user = ess.getUser(args[pos]);
if (user != null) {
if (!getOffline && (user.getBase() instanceof OfflinePlayer || user.isHidden())) {
throw new NoSuchFieldException(Util.i18n("playerNotFound"));
}
return user;
}
if (
user != null && ( // if the user exists, and either
getOffline || // 1) we allow offline players
!( // 2) the player is not offline/hidden
user.getBase() instanceof OfflinePlayer ||
user.isHidden()
)
)
) return user;

// try to find a user that matches the partial string
final List<Player> matches = server.matchPlayer(args[pos]);

if (!matches.isEmpty()) {
Expand Down