From 9f199b1a5a2b6e48e83fd060687fcaf3620dee0e Mon Sep 17 00:00:00 2001 From: DNx Date: Wed, 25 Nov 2015 05:04:38 +0700 Subject: [PATCH 1/4] Update AuthMePlayerListener.java --- .../java/fr/xephi/authme/listener/AuthMePlayerListener.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java index e2852359..5fb464f4 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java @@ -57,6 +57,12 @@ public class AuthMePlayerListener implements Listener { * @param event AsyncPlayerChatEvent */ private void handleChat(AsyncPlayerChatEvent event) { + for (Player p : Utils.getOnlinePlayers()) { + if (p != player && !PlayerCache.getInstance().isAuthenticated(p)) { + event.getRecipients().remove(p); + } + } + if (Settings.isChatAllowed) { return; } From da390530e9866b9afd1aa724eb959257e2c1a2b6 Mon Sep 17 00:00:00 2001 From: DNx Date: Wed, 25 Nov 2015 05:05:41 +0700 Subject: [PATCH 2/4] Update AuthMePlayerListener.java --- .../java/fr/xephi/authme/listener/AuthMePlayerListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java index 5fb464f4..563f332e 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java @@ -57,6 +57,7 @@ public class AuthMePlayerListener implements Listener { * @param event AsyncPlayerChatEvent */ private void handleChat(AsyncPlayerChatEvent event) { + Player player = event.getPlayer(); for (Player p : Utils.getOnlinePlayers()) { if (p != player && !PlayerCache.getInstance().isAuthenticated(p)) { event.getRecipients().remove(p); @@ -67,7 +68,6 @@ public class AuthMePlayerListener implements Listener { return; } - Player player = event.getPlayer(); if (Utils.checkAuth(player)) { return; } From be1eb9392aaf660185a2dce90b82e0fc21e3ab98 Mon Sep 17 00:00:00 2001 From: DNx Date: Wed, 25 Nov 2015 05:10:13 +0700 Subject: [PATCH 3/4] ugh --- .../java/fr/xephi/authme/listener/AuthMePlayerListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java index 563f332e..89b75285 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java @@ -59,7 +59,7 @@ public class AuthMePlayerListener implements Listener { private void handleChat(AsyncPlayerChatEvent event) { Player player = event.getPlayer(); for (Player p : Utils.getOnlinePlayers()) { - if (p != player && !PlayerCache.getInstance().isAuthenticated(p)) { + if (p != player && !PlayerCache.getInstance().isAuthenticated(p.getName())) { event.getRecipients().remove(p); } } From 2c0d140da99485ae2c16c31a2e25c34e77e15e97 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Tue, 24 Nov 2015 23:23:45 +0100 Subject: [PATCH 4/4] Try to fix NPC issues --- .../java/fr/xephi/authme/listener/AuthMePlayerListener.java | 4 ++-- src/main/java/fr/xephi/authme/util/Utils.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java index 89b75285..502d2f4f 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java @@ -220,7 +220,7 @@ public class AuthMePlayerListener implements Listener { */ @EventHandler(priority = EventPriority.HIGHEST) public void onPlayerJoin(PlayerJoinEvent event) { - if (event.getPlayer() == null) { + if (event.getPlayer() == null || Utils.isNPC(event.getPlayer())) { return; } @@ -256,7 +256,7 @@ public class AuthMePlayerListener implements Listener { public void onPreLogin(AsyncPlayerPreLoginEvent event) { final String name = event.getName().toLowerCase(); final Player player = Utils.getPlayer(name); - if (player == null) { + if (player == null || Utils.isNPC(player)) { return; } diff --git a/src/main/java/fr/xephi/authme/util/Utils.java b/src/main/java/fr/xephi/authme/util/Utils.java index bf8821ab..99a01f8f 100644 --- a/src/main/java/fr/xephi/authme/util/Utils.java +++ b/src/main/java/fr/xephi/authme/util/Utils.java @@ -128,7 +128,7 @@ public final class Utils { // TODO: Move to a Manager public static boolean checkAuth(Player player) { - if (player == null || Utils.isUnrestricted(player)) { + if (player == null || Utils.isUnrestricted(player) || Utils.isNPC(player)) { return true; }