From 8c874adbf32943d71011f31bd3d3055811fe393d Mon Sep 17 00:00:00 2001 From: EinfacheSache Date: Tue, 29 Aug 2023 18:11:22 +0200 Subject: [PATCH] Bugfix -> forget to add something --- .../de/cubeattack/neoprotect/bungee/listener/ChatListener.java | 2 +- .../de/cubeattack/neoprotect/spigot/listener/ChatListener.java | 2 +- .../cubeattack/neoprotect/velocity/listener/ChatListener.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/cubeattack/neoprotect/bungee/listener/ChatListener.java b/src/main/java/de/cubeattack/neoprotect/bungee/listener/ChatListener.java index 3d32fbe..9dc54ab 100644 --- a/src/main/java/de/cubeattack/neoprotect/bungee/listener/ChatListener.java +++ b/src/main/java/de/cubeattack/neoprotect/bungee/listener/ChatListener.java @@ -20,7 +20,7 @@ public ChatListener(NeoProtectBungee instance) { public void onChat(ChatEvent event) { CommandSender sender = (CommandSender) event.getSender(); - if (!sender.hasPermission("neoprotect.admin") || !instance.getCore().getPlayerInSetup().contains(sender) || event.isCommand()) + if ((!sender.hasPermission("neoprotect.admin") && !instance.getCore().isPlayerMaintainer((((ProxiedPlayer) sender).getUniqueId()), instance.getProxy().getConfig().isOnlineMode())) || !instance.getCore().getPlayerInSetup().contains(sender) || event.isCommand()) return; event.setCancelled(true); diff --git a/src/main/java/de/cubeattack/neoprotect/spigot/listener/ChatListener.java b/src/main/java/de/cubeattack/neoprotect/spigot/listener/ChatListener.java index e5971da..03b1597 100644 --- a/src/main/java/de/cubeattack/neoprotect/spigot/listener/ChatListener.java +++ b/src/main/java/de/cubeattack/neoprotect/spigot/listener/ChatListener.java @@ -22,7 +22,7 @@ public ChatListener(NeoProtectSpigot instance) { public void onChat(AsyncPlayerChatEvent event) { Player player = event.getPlayer(); - if (!player.hasPermission("neoprotect.admin") || !instance.getCore().getPlayerInSetup().contains(player)) + if ((!player.hasPermission("neoprotect.admin") && !instance.getCore().isPlayerMaintainer(event.getPlayer().getUniqueId(), instance.getServer().getOnlineMode())) || !instance.getCore().getPlayerInSetup().contains(player)) return; event.setCancelled(true); diff --git a/src/main/java/de/cubeattack/neoprotect/velocity/listener/ChatListener.java b/src/main/java/de/cubeattack/neoprotect/velocity/listener/ChatListener.java index a1b5b9c..967d69e 100644 --- a/src/main/java/de/cubeattack/neoprotect/velocity/listener/ChatListener.java +++ b/src/main/java/de/cubeattack/neoprotect/velocity/listener/ChatListener.java @@ -19,7 +19,7 @@ public void onChat(PlayerChatEvent event) { Player player = event.getPlayer(); - if (!player.hasPermission("neoprotect.admin") || !instance.getCore().getPlayerInSetup().contains(player)) + if ((!player.hasPermission("neoprotect.admin") && !instance.getCore().isPlayerMaintainer(player.getUniqueId(), instance.getProxy().getConfiguration().isOnlineMode())) || !instance.getCore().getPlayerInSetup().contains(player)) return; event.setResult(PlayerChatEvent.ChatResult.denied());