Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into enums

Browse Source
This commit is contained in:
ljacqu 2015-11-24 23:32:54 +01:00
commit 0065a6a827
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
View File

@ -57,11 +57,17 @@ public class AuthMePlayerListener implements Listener {
* @param event AsyncPlayerChatEvent * @param event AsyncPlayerChatEvent
*/ */
private void handleChat(AsyncPlayerChatEvent event) { private void handleChat(AsyncPlayerChatEvent event) {
Player player = event.getPlayer();
for (Player p : Utils.getOnlinePlayers()) {
if (p != player && !PlayerCache.getInstance().isAuthenticated(p.getName())) {
event.getRecipients().remove(p);
}
}
if (Settings.isChatAllowed) { if (Settings.isChatAllowed) {
return; return;
} }
Player player = event.getPlayer();
if (Utils.checkAuth(player)) { if (Utils.checkAuth(player)) {
return; return;
} }
@ -214,7 +220,7 @@ public class AuthMePlayerListener implements Listener {
*/ */
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerJoin(PlayerJoinEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
if (event.getPlayer() == null) { if (event.getPlayer() == null || Utils.isNPC(event.getPlayer())) {
return; return;
} }
@ -250,7 +256,7 @@ public class AuthMePlayerListener implements Listener {
public void onPreLogin(AsyncPlayerPreLoginEvent event) { public void onPreLogin(AsyncPlayerPreLoginEvent event) {
final String name = event.getName().toLowerCase(); final String name = event.getName().toLowerCase();
final Player player = Utils.getPlayer(name); final Player player = Utils.getPlayer(name);
if (player == null) { if (player == null || Utils.isNPC(player)) {
return; return;
} }

2
src/main/java/fr/xephi/authme/util/Utils.java
View File

@ -130,7 +130,7 @@ public final class Utils {
// TODO: Move to a Manager // TODO: Move to a Manager
public static boolean checkAuth(Player player) { public static boolean checkAuth(Player player) {
if (player == null || Utils.isUnrestricted(player)) { if (player == null || Utils.isUnrestricted(player) || Utils.isNPC(player)) {
return true; return true;
} }