Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Update SendCommand

Browse Source
This commit is contained in:
YoyoNow
2024-08-06 14:03:57 +02:00
parent 2c43ba1cda
commit 2ca8443e42
1 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VelocityCore/src/de/steamwar/velocitycore/commands/SendCommand.java
+34 -18
View File
@@ -20,15 +20,16 @@
package de.steamwar.velocitycore.commands; package de.steamwar.velocitycore.commands;
import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.server.RegisteredServer;
import com.velocitypowered.api.proxy.server.ServerInfo;
import de.steamwar.command.PreviousArguments; import de.steamwar.command.PreviousArguments;
import de.steamwar.command.SWCommand; import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeMapper; import de.steamwar.command.TypeMapper;
import de.steamwar.messages.Chatter; import de.steamwar.messages.Chatter;
import de.steamwar.messages.PlayerChatter;
import de.steamwar.persistent.Servertype;
import de.steamwar.persistent.Subserver; import de.steamwar.persistent.Subserver;
import de.steamwar.sql.SteamwarUser; import de.steamwar.sql.SteamwarUser;
import de.steamwar.sql.UserPerm; import de.steamwar.sql.UserPerm;
import de.steamwar.velocitycore.VelocityCore;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@@ -41,19 +42,18 @@ public class SendCommand extends SWCommand {
} }
@Register @Register
public void sendToServer(PlayerChatter sender, Player send, Subserver server) { public void sendToServer(Chatter sender, Player send, RegisteredServer server) {
send.createConnectionRequest(server.getRegisteredServer()).fireAndForget(); send.createConnectionRequest(server).fireAndForget();
} }
@ClassMapper(value = Subserver.class, local = true) @ClassMapper(value = RegisteredServer.class, local = true)
public TypeMapper<Subserver> subserverTypeMapper() { public TypeMapper<RegisteredServer> subserverTypeMapper() {
return new TypeMapper<>() { return new TypeMapper<>() {
@Override @Override
public Subserver map(Chatter sender, PreviousArguments previousArguments, String s) { public RegisteredServer map(Chatter sender, PreviousArguments previousArguments, String s) {
List<Subserver> subservers = Subserver.getServerList(); for (RegisteredServer registeredServer : VelocityCore.getProxy().getAllServers()) {
for (Subserver subserver : subservers) { if (registeredServer.getServerInfo().getName().equals(s)) {
if (subserver.getServer().getName().replace(' ', '_').equals(s)) { return registeredServer;
return subserver;
} }
} }
return null; return null;
@@ -62,15 +62,31 @@ public class SendCommand extends SWCommand {
@Override @Override
public Collection<String> tabCompletes(Chatter sender, PreviousArguments previousArguments, String s) { public Collection<String> tabCompletes(Chatter sender, PreviousArguments previousArguments, String s) {
SteamwarUser user = sender.user(); SteamwarUser user = sender.user();
List<Subserver> subservers = Subserver.getServerList();
List<String> tabCompletes = new ArrayList<>(); List<String> tabCompletes = new ArrayList<>();
for (Subserver subserver : subservers) { for (RegisteredServer registeredServer : VelocityCore.getProxy().getAllServers()) {
if (subserver.getType() == Servertype.BAUSERVER) continue; ServerInfo serverInfo = registeredServer.getServerInfo();
if (subserver.getType() == Servertype.ARENA && (user.hasPerm(UserPerm.MODERATION) || user.hasPerm(UserPerm.ADMINISTRATION))) { String name = serverInfo.getName();
tabCompletes.add(subserver.getServer().getName().replace(' ', '_')); if (name.contains(" ")) continue;
Subserver subserver = Subserver.getSubserver(serverInfo);
if (subserver == null) {
tabCompletes.add(name);
continue;
} }
if (subserver.getType() == Servertype.BUILDER && user.hasPerm(UserPerm.BUILD)) {
tabCompletes.add(subserver.getServer().getName().replace(' ', '_')); switch (subserver.getType()) {
case ARENA:
if (user.hasPerm(UserPerm.MODERATION) || user.hasPerm(UserPerm.ADMINISTRATION)) {
tabCompletes.add(name);
}
break;
case BUILDER:
if (user.hasPerm(UserPerm.BUILD)) {
tabCompletes.add(name);
}
break;
default:
break;
} }
} }
return tabCompletes; return tabCompletes;