GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-31 20:56:44 +00:00
Code Issues Releases Activity

Fixed #124 and whitelist command only works on non-proxies.

Browse Source
This commit is contained in:
Tim203
2021-03-29 20:06:26 +02:00
parent 0bbe3d8cf1
commit b5e7d05315
5 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/main/java/org/geysermc/floodgate/command/WhitelistCommand.java
View File

@@ -36,6 +36,7 @@ import com.google.inject.Inject;
import lombok.Getter;
import org.geysermc.floodgate.api.logger.FloodgateLogger;
import org.geysermc.floodgate.config.FloodgateConfig;
import org.geysermc.floodgate.config.ProxyFloodgateConfig;
import org.geysermc.floodgate.platform.command.CommandMessage;
import org.geysermc.floodgate.platform.command.CommandUtil;
import org.geysermc.floodgate.platform.command.FloodgateCommand;
@@ -139,6 +140,12 @@ public class WhitelistCommand implements FloodgateCommand {
// ignored, all the logic is in the other method
}
@Override
public boolean shouldRegister(FloodgateConfig config) {
// currently only Spigot (our only non-Proxy platform) has a whitelist build-in.
return config instanceof ProxyFloodgateConfig;
}
@Getter
public enum Message implements CommandMessage {
INVALID_USERNAME("floodgate.command.fwhitelist.invalid_username"),

19
common/src/main/java/org/geysermc/floodgate/platform/command/CommandUtil.java
View File

@@ -50,14 +50,14 @@ public interface CommandUtil {
@NonNull Collection<String> getOnlineUsernames(final @NonNull PlayerType limitTo);
/**
* Send a message to the specified player, no matter what platform Floodgate is running on.
* Send a message to the specified target, no matter what platform Floodgate is running on.
*
* @param player the player to send the message to
* @param target the target to send the message to
* @param message the command message
* @param locale the locale of the player
* @param args the arguments
*/
void sendMessage(Object player, String locale, CommandMessage message, Object... args);
void sendMessage(Object target, String locale, CommandMessage message, Object... args);
/**
* Same as {@link CommandUtil#sendMessage(Object, String, CommandMessage, Object...)} except it
@@ -75,9 +75,12 @@ public interface CommandUtil {
*
* @param xuid the xuid of the username to be whitelisted
* @param username the username to be whitelisted
* @return true if the player has been whitelisted, false if the player was already whitelisted
* @return true if the player has been whitelisted, false if the player was already whitelisted.
* Defaults to false when this platform doesn't support whitelisting.
*/
boolean whitelistPlayer(String xuid, String username);
default boolean whitelistPlayer(String xuid, String username) {
return false;
}
/**
* Removes the given Bedrock player from the whitelist.
@@ -85,7 +88,9 @@ public interface CommandUtil {
* @param xuid the xuid of the username to be removed from the whitelist
* @param username the username to be removed from the whitelist
* @return true if the player has been removed from the whitelist, false if the player wasn't
* whitelisted
* whitelisted. Defaults to false when this platform doesn't support whitelisting.
*/
boolean removePlayerFromWhitelist(String xuid, String username);
default boolean removePlayerFromWhitelist(String xuid, String username) {
return false;
}
}