Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Support bungee /server command in Citizens command

This commit is contained in:
fullwall 2020-04-25 19:10:49 +08:00
parent fe8eb4e85d
commit dc72f7526c
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/src/main/java/net/citizensnpcs/Citizens.java
View File

@ -322,6 +322,7 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
registerCommands();
enableSubPlugins();
NMS.load(commands);
getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
commands.registerTabCompletion(this);
// Setup NPCs after all plugins have been enabled (allows for multiworld

13
main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
View File

@ -7,8 +7,11 @@ import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.npc.NPC;
@ -136,6 +139,7 @@ public class CommandTrait extends Trait {
}
private static class NPCCommand {
String bungeeServer;
String command;
int cooldown;
Hand hand;
@ -155,6 +159,8 @@ public class CommandTrait extends Trait {
this.cooldown = cooldown;
this.perms = perms;
this.n = n;
List<String> split = Splitter.on(' ').omitEmptyStrings().trimResults().splitToList(command);
this.bungeeServer = split.size() == 2 && split.get(0).equalsIgnoreCase("server") ? split.get(1) : null;
}
public void run(NPC npc, Player clicker) {
@ -164,6 +170,13 @@ public class CommandTrait extends Trait {
if (op) {
clicker.setOp(true);
}
if (bungeeServer != null) {
ByteArrayDataOutput out = ByteStreams.newDataOutput();
out.writeUTF("Connect");
out.writeUTF(bungeeServer);
clicker.sendPluginMessage(CitizensAPI.getPlugin(), "BungeeCord", out.toByteArray());
}
try {
clicker.chat("/" + interpolatedCommand);
} catch (Throwable t) {