Skip to content

Commit 7abfc5c

Browse files
committed
Fix issue with version detection in 26.1 and newer.
1 parent 2e34d8e commit 7abfc5c

3 files changed

Lines changed: 13 additions & 62 deletions

File tree

src/main/java/net/jadedmc/commandblockerpro/CommandBlockerProPlugin.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import net.jadedmc.commandblockerpro.rules.RuleManager;
3232
import net.jadedmc.commandblockerpro.utils.ChatUtils;
3333
import net.jadedmc.commandblockerpro.utils.CommandUtils;
34-
import net.jadedmc.commandblockerpro.utils.VersionUtils;
3534
import org.bstats.bukkit.Metrics;
3635
import org.bukkit.plugin.java.JavaPlugin;
3736

@@ -107,7 +106,13 @@ private void registerListeners() {
107106
getServer().getPluginManager().registerEvents(new PlayerCommandPreprocessListener(this), this);
108107

109108
// This event only exists on 1.13+.
110-
if(VersionUtils.getServerVersion() >= 13) getServer().getPluginManager().registerEvents(new PlayerCommandSendListener(this), this);
109+
try {
110+
Class.forName("org.bukkit.event.player.PlayerCommandSendEvent");
111+
getServer().getPluginManager().registerEvents(new PlayerCommandSendListener(this), this);
112+
}
113+
catch (ClassNotFoundException e) {
114+
this.getLogger().warning("PlayerCommandSendEvent not found. Disabling tab completion blocking.");
115+
}
111116

112117
// Supports BetterReload if installed.
113118
if(this.hookManager.useBetterReload()) getServer().getPluginManager().registerEvents(new ReloadListener(this), this);

src/main/java/net/jadedmc/commandblockerpro/utils/ChatUtils.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,13 @@ public static Component translate(@NotNull final String message) {
105105
*/
106106
public static String replaceLegacy(@NotNull String message) {
107107

108-
// If the version is 1.16 or greater, check for hex color codes.
109-
if(VersionUtils.getServerVersion() >= 16) {
110-
Pattern pattern = Pattern.compile("&#[a-fA-F0-9]{6}");
111-
Matcher matcher = pattern.matcher(message);
108+
Pattern pattern = Pattern.compile("&#[a-fA-F0-9]{6}");
109+
Matcher matcher = pattern.matcher(message);
112110

113-
while (matcher.find()) {
114-
String color = message.substring(matcher.start() + 1, matcher.end());
115-
message = message.replace("&" + color, "<reset><color:" + color + ">");
116-
matcher = pattern.matcher(message);
117-
}
111+
while (matcher.find()) {
112+
String color = message.substring(matcher.start() + 1, matcher.end());
113+
message = message.replace("&" + color, "<reset><color:" + color + ">");
114+
matcher = pattern.matcher(message);
118115
}
119116

120117
// Then replace legacy color codes.

src/main/java/net/jadedmc/commandblockerpro/utils/VersionUtils.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)