Skip to content

Commit

Permalink
1.2.1
Browse files Browse the repository at this point in the history
更新内容:
1. 修复一个已知问题 现在1.13+ 也允许在不重启服务器的情况下更新命令列表
  • Loading branch information
msgdw committed Jun 9, 2021
1 parent 7290b45 commit 62e8400
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 18 deletions.
19 changes: 4 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>pro.sandiao.plugin</groupId>
<artifactId>CommandWhitelist</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
<packaging>jar</packaging>

<name>CommandWhitelist</name>
Expand All @@ -19,11 +19,6 @@
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<!-- NMS的Maven仓库 -->
<repository>
<id>nms-repo</id>
<url>https://repo.codemc.io/repository/nms/</url>
</repository>
<!-- placeholderapi的Maven仓库 -->
<repository>
<id>placeholderapi</id>
Expand All @@ -37,18 +32,12 @@
</repositories>

<dependencies>
<!-- SpigotAPI -->
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.14.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- NMS -->
<!-- Spigot -->
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.14.4-R0.1-20191224.232152-15</version>
<version>1.16.5-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- PlaceholderAPI -->
<dependency>
Expand Down
13 changes: 10 additions & 3 deletions src/main/java/pro/sandiao/plugin/commandwhitelist/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void onEnable() {
Bukkit.getConsoleSender().sendMessage("[CommandWhitelis] §aBlocking command turned on.");
}

int i = Integer.valueOf(version.split("_")[1]);
int i = Integer.parseInt(version.split("_")[1]);
if (version.startsWith("v1") && i < 13) {
isHighVersion = false;
} else {
Expand Down Expand Up @@ -138,10 +138,17 @@ public void onReload(CommandSender sender) {
reloadConfig();
whitelistManager.loadWhitelistByConfigFile(getConfig());
whitelistManager.loadGroupByConfigFile(getGroupConfig());
updateCompleteList();
sender.sendMessage("[CommandWhitelis] §aPlugin reload success.");
}

/**
* 1.13+ 更新补全列表
*/
public void updateCompleteList() {
if (tabCompletePackageListener != null) {
Bukkit.getOnlinePlayers().forEach(tabCompletePackageListener.getTabCompletePacketAdapter()::sendPacket);
tabCompletePackageListener.updateCompleteList();
}
sender.sendMessage("[CommandWhitelis] §aPlugin reload success.");
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ private void addCommand(CommandSender sender, String[] args) {
config.set("command-whitelist.list", list);
Main.getInstance().saveConfig();
Main.getWhitelistManager().loadWhitelistByConfigFile(Main.getInstance().getConfig());
Main.getInstance().updateCompleteList();
sender.sendMessage("成功向命令白名单内添加命令 " + args[1]);
}

Expand All @@ -142,6 +143,7 @@ private void addComplete(CommandSender sender, String[] args) {
config.set("tab-complete-whitelist.list", list);
Main.getInstance().saveConfig();
Main.getWhitelistManager().loadWhitelistByConfigFile(Main.getInstance().getConfig());
Main.getInstance().updateCompleteList();
sender.sendMessage("成功向补全白名单内添加命令 " + args[1]);
}

Expand All @@ -159,6 +161,7 @@ private void addGroupCommand(CommandSender sender, String[] args) {
config.set("group." + args[1], list);
Main.getInstance().saveGroupConfig();
Main.getWhitelistManager().loadGroupByConfigFile(Main.getInstance().getGroupConfig());
Main.getInstance().updateCompleteList();
sender.sendMessage("成功向组 " + args[1] + " 内添加命令 " + args[2]);
}

Expand All @@ -179,6 +182,7 @@ private void removeCommand(CommandSender sender, String[] args) {
config.set("command-whitelist.list", list);
Main.getInstance().saveConfig();
Main.getWhitelistManager().loadWhitelistByConfigFile(Main.getInstance().getConfig());
Main.getInstance().updateCompleteList();
sender.sendMessage("成功从命令白名单中移除命令 " + args[1]);
}

Expand All @@ -199,6 +203,7 @@ private void removeComplete(CommandSender sender, String[] args) {
config.set("tab-complete-whitelist.list", list);
Main.getInstance().saveConfig();
Main.getWhitelistManager().loadWhitelistByConfigFile(Main.getInstance().getConfig());
Main.getInstance().updateCompleteList();
sender.sendMessage("成功从补全白名单中移除命令 " + args[1]);
}

Expand All @@ -219,6 +224,7 @@ private void removeGroupCommand(CommandSender sender, String[] args) {
config.set("group." + args[1], list.isEmpty() ? null : list);
Main.getInstance().saveGroupConfig();
Main.getWhitelistManager().loadGroupByConfigFile(Main.getInstance().getGroupConfig());
Main.getInstance().updateCompleteList();
sender.sendMessage("成功从组 " + args[1] + " 内移除命令 " + args[2]);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.ProtocolManager;

import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;

import pro.sandiao.plugin.commandwhitelist.listener.adapter.NewTabCompletePacketAdapter;
Expand Down Expand Up @@ -42,4 +44,18 @@ public void registerListener(boolean isHighVersion) {
public TabCompletePacketAdapter getTabCompletePacketAdapter() {
return tabCompletePacketAdapter;
}

/**
* 更新补全列表
*
* 1.13+
*/
public void updateCompleteList() {
if (tabCompletePacketAdapter instanceof NewTabCompletePacketAdapter) {
for (Player player : Bukkit.getOnlinePlayers()) {
tabCompletePacketAdapter.sendPacket(player);
player.updateCommands();
}
}
}
}

0 comments on commit 62e8400

Please sign in to comment.