Fix npe after register.

2015-12-01 01:29:56 +07:00
parent 4af4d424ee
commit 029214c080
4 changed files with 55 additions and 30 deletions
@@ -50,14 +50,12 @@ public class AsynchronousJoin {
    }

    public void process() {
-        if (AuthMePlayerListener.gameMode.containsKey(name))
-            AuthMePlayerListener.gameMode.remove(name);
-        AuthMePlayerListener.gameMode.putIfAbsent(name, player.getGameMode());
-
-        if (Utils.isNPC(player) || Utils.isUnrestricted(player)) {
+        if (Utils.isUnrestricted(player)) {
            return;
        }

+        AuthMePlayerListener.gameMode.put(name, player.getGameMode());
+
        if (plugin.ess != null && Settings.disableSocialSpy) {
            plugin.ess.getUser(player).setSocialSpyEnabled(false);
        }