From be89eec23bee3389a2dfaea94679cddc82a9b0dc Mon Sep 17 00:00:00 2001
From: games647 <games@tsprivat.de>
Date: Fri, 10 Jun 2016 08:52:25 +0200
Subject: [PATCH] Fix NPE on premium name check if it's pure cracked player

(Fixes #21)
---
 CHANGELOG.md                                               | 7 ++++++-
 .../fastlogin/bukkit/listener/ProtocolSupportListener.java | 5 +++--
 .../bukkit/listener/packet/StartPacketListener.java        | 5 +++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b470dcc6..693f2239 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,12 @@
+######1.5
+
+* Added localization
+* Fixed NPE on premium name check if it's pure cracked player
+
 ######1.4
 
 * Added Bungee setAuthPlugin method
-* Added nameChangeCheck 
+* Added nameChangeCheck
 * Multiple BungeeCord support
 
 ######1.3.1
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ProtocolSupportListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ProtocolSupportListener.java
index ba8bafd3..1335a57d 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ProtocolSupportListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ProtocolSupportListener.java
@@ -50,7 +50,7 @@ public class ProtocolSupportListener implements Listener {
 
                 //user not exists in the db
                 try {
-                    if (plugin.getConfig().getBoolean("nameChangeCheck")) {
+                    if (premiumUUID != null && plugin.getConfig().getBoolean("nameChangeCheck")) {
                         profile = plugin.getCore().getStorage().loadProfile(premiumUUID);
                         if (profile != null) {
                             plugin.getLogger().log(Level.FINER, "Player {0} changed it's username", premiumUUID);
@@ -59,7 +59,8 @@ public class ProtocolSupportListener implements Listener {
                         }
                     }
 
-                    if (plugin.getConfig().getBoolean("autoRegister") && !authPlugin.isRegistered(username)) {
+                    if (premiumUUID != null
+                            && plugin.getConfig().getBoolean("autoRegister") && !authPlugin.isRegistered(username)) {
                         plugin.getLogger().log(Level.FINER, "Player {0} uses a premium username", username);
                         startPremiumSession(username, loginStartEvent, false, profile);
                         return;
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/packet/StartPacketListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/packet/StartPacketListener.java
index 20d18b6e..b59a78e4 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/packet/StartPacketListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/packet/StartPacketListener.java
@@ -93,7 +93,7 @@ public class StartPacketListener extends PacketAdapter {
 
                 //user not exists in the db
                 try {
-                    if (plugin.getConfig().getBoolean("nameChangeCheck")) {
+                    if (premiumUUID != null && plugin.getConfig().getBoolean("nameChangeCheck")) {
                         profile = plugin.getCore().getStorage().loadProfile(premiumUUID);
                         if (profile != null) {
                             plugin.getLogger().log(Level.FINER, "Player {0} changed it's username", premiumUUID);
@@ -102,7 +102,8 @@ public class StartPacketListener extends PacketAdapter {
                         }
                     }
 
-                    if (plugin.getConfig().getBoolean("autoRegister") && !authPlugin.isRegistered(username)) {
+                    if (premiumUUID != null
+                            && plugin.getConfig().getBoolean("autoRegister") && !authPlugin.isRegistered(username)) {
                         plugin.getLogger().log(Level.FINER, "Player {0} uses a premium username", username);
                         enablePremiumLogin(username, profile, sessionKey, player, packetEvent, false);
                         return;