Fix to critical issue #6

This commit is contained in:
Tomasz Kuraczyk 2026-03-17 20:32:20 +01:00
parent 7ffd52d4f9
commit 18cf76ae7f
6 changed files with 165 additions and 38 deletions

View file

@ -123,10 +123,7 @@ public class BanIP implements CommandExecutor {
if(b != null) {
if(banEndDate == null) {
for(Player target : Bukkit.getOnlinePlayers()) {
if (target.getAddress().getAddress().equals(addr))
if(Objects.equals(plugin.config.getString("serverID"), scope) || Objects.equals(scope, "*")) target.kick(TextUtils.colorString(TextUtils.resolvePlaceholders(plugin.translations.getString("banKickMessage.playerBanPerm"), b)));
}
createIPKickJob(b, scope);
p.sendMessage(TextUtils.colorString(resolveIpBanMessagePlaceholders(addPrefix(plugin.translations.getString("command.banip.successfulBanMessagePerm")), args[0], scope, reason, p.getName())));
String bcMess = plugin.translations.getString("command.banip.banPublicAnnouncementPerm");
if(bcMess!=null) Bukkit.broadcast(TextUtils.colorString(resolveIpBanMessagePlaceholders(bcMess, args[0], scope, reason, p.getName())));
@ -142,11 +139,7 @@ public class BanIP implements CommandExecutor {
long timeLeftSeconds = TimeUnit.MILLISECONDS.toSeconds(timeLeft);
String parsedBanDuration = TextUtils.parsePolishDate(timeLeftDays, timeLeftHours, timeLeftMinutes, timeLeftSeconds);
for(Player target : Bukkit.getOnlinePlayers()) {
if (target.getAddress().getAddress().equals(addr))
if (Objects.equals(plugin.config.getString("serverID"), scope) || Objects.equals(scope, "*"))
target.kick(TextUtils.colorString(TextUtils.resolvePlaceholders(plugin.translations.getString("banKickMessage.playerBanTemp"), b)));
}
createIPKickJob(b, scope);
p.sendMessage(TextUtils.colorString(resolveIpBanMessagePlaceholders(addPrefix(plugin.translations.getString("command.banip.successfulBanMessageTemp")), args[0], scope, reason, p.getName(), parsedBanDuration)));
String bcMess = plugin.translations.getString("command.banip.banPublicAnnouncementTemp");
if(bcMess!=null) Bukkit.broadcast(TextUtils.colorString(resolveIpBanMessagePlaceholders(bcMess, args[0], scope, reason, p.getName(), parsedBanDuration)));
@ -245,10 +238,7 @@ public class BanIP implements CommandExecutor {
if(b != null) {
if(banEndDate == null) {
for(Player target : Bukkit.getOnlinePlayers()) {
if (target.getAddress().getAddress().equals(addr))
if(Objects.equals(plugin.config.getString("serverID"), scope) || Objects.equals(scope, "*")) target.kick(TextUtils.colorString(TextUtils.resolvePlaceholders(plugin.translations.getString("banKickMessage.playerBanPerm"), b)));
}
createIPKickJob(b, scope);
Bukkit.getConsoleSender().sendMessage(TextUtils.colorString(resolveIpBanMessagePlaceholders(addPrefix(plugin.translations.getString("command.banip.successfulBanMessagePerm")), args[0], scope, reason, "CONSOLE")));
String bcMess = plugin.translations.getString("command.banip.banPublicAnnouncementPerm");
if(bcMess!=null) Bukkit.broadcast(TextUtils.colorString(resolveIpBanMessagePlaceholders(bcMess, args[0], scope, reason, "CONSOLE")));
@ -264,11 +254,7 @@ public class BanIP implements CommandExecutor {
long timeLeftSeconds = TimeUnit.MILLISECONDS.toSeconds(timeLeft);
String parsedBanDuration = TextUtils.parsePolishDate(timeLeftDays, timeLeftHours, timeLeftMinutes, timeLeftSeconds);
for(Player target : Bukkit.getOnlinePlayers()) {
if (target.getAddress().getAddress().equals(addr))
if (Objects.equals(plugin.config.getString("serverID"), scope) || Objects.equals(scope, "*"))
target.kick(TextUtils.colorString(TextUtils.resolvePlaceholders(plugin.translations.getString("banKickMessage.playerBanTemp"), b)));
}
createIPKickJob(b, scope);
Bukkit.getConsoleSender().sendMessage(TextUtils.colorString(resolveIpBanMessagePlaceholders(addPrefix(plugin.translations.getString("command.banip.successfulBanMessageTemp")), args[0], scope, reason, "CONSOLE", parsedBanDuration)));
String bcMess = plugin.translations.getString("command.banip.banPublicAnnouncementTemp");
if(bcMess!=null) Bukkit.broadcast(TextUtils.colorString(resolveIpBanMessagePlaceholders(bcMess, args[0], scope, reason, "CONSOLE", parsedBanDuration)));