Fix NPE on premium name check if it's pure cracked player

(Fixes #21)
This commit is contained in:
games647
2016-06-10 08:52:25 +02:00
parent 679060d4e9
commit be89eec23b
3 changed files with 12 additions and 5 deletions

View File

@ -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

View File

@ -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;

View File

@ -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;