Skip to content

Dev #1

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 3 commits into from
Jul 6, 2025
Merged

Dev #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0f92cd
removed list command
Josscoder Jul 6, 2025
bb38df0
fix: transfer permission
Josscoder Jul 6, 2025
f1a4f84
feat: impl transfer validation
Josscoder Jul 6, 2025
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
11 changes: 9 additions & 2 deletions nukkit/src/main/java/net/josscoder/redisbridge/nukkit/command/TransferCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
import cn.nukkit.utils.TextFormat;
import net.josscoder.redisbridge.core.data.InstanceInfo;
import net.josscoder.redisbridge.core.manager.InstanceManager;
import net.josscoder.redisbridge.nukkit.RedisBridgePlugin;

public class TransferCommand extends Command {

public TransferCommand() {
super("transfer", "Transfer to a server", "/transfer <serverID>");
setPermission("redisbridge.transfer");
setPermission("redisbridge.transfer.command.permission");
}

@Override
Expand All @@ -34,7 +35,13 @@ public boolean execute(CommandSender sender, String label, String[] args) {

InstanceInfo instance = InstanceManager.getInstance().getInstanceById(serverID);
if (instance == null) {
player.sendMessage(TextFormat.RED + "That server does not exist!");
player.sendMessage(TextFormat.RED + "Server does not exist!");

return false;
}

if (instance.getId().equalsIgnoreCase(RedisBridgePlugin.getInstance().getCurrentInstanceInfo().getId())) {
player.sendMessage(TextFormat.RED + "You are already on this server!");

return false;
}
Expand Down
1 change: 0 additions & 1 deletion waterdogpe/src/main/java/net/josscoder/redisbridge/waterdogpe/RedisBridgePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ private void setupCommands() {
CommandMap map = getProxy().getCommandMap();
map.unregisterCommand("wdlist");
map.registerCommand(new WhereAmICommand());
//map.registerCommand(new ListCommand());
}

private void setupEvents() {
Expand Down
4 changes: 0 additions & 4 deletions waterdogpe/src/main/java/net/josscoder/redisbridge/waterdogpe/command/ListCommand.java
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion waterdogpe/src/main/java/net/josscoder/redisbridge/waterdogpe/event/ProxyEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ public static void onQuery(ProxyQueryEvent event) {

public static void onTransferRequest(ServerTransferRequestEvent event) {
ProxiedPlayer player = event.getPlayer();
ServerInfo currentServer = player.getServerInfo();
ServerInfo targetServer = event.getTargetServer();

if (player.getServerInfo() == null || targetServer == null || player.getServerInfo().getServerName().equalsIgnoreCase(targetServer.getServerName())) {
if (currentServer == null || targetServer == null || currentServer.getServerName().equalsIgnoreCase(targetServer.getServerName())) {
return;
}

Expand Down