Fix BungeeCord not setting an premium uuid (Fixes #35)

This commit is contained in:
games647
2016-07-09 13:30:43 +02:00
parent bb2e60f6e1
commit 0745957e79
5 changed files with 17 additions and 14 deletions
@@ -57,8 +57,9 @@ public class NameCheckTask implements Runnable {
//user not exists in the db
try {
if (plugin.getConfig().getBoolean("nameChangeCheck") || (plugin.getConfig().getBoolean("autoRegister")
&& plugin.getAuthPlugin().isRegistered(username))) {
boolean isRegistered = plugin.getAuthPlugin().isRegistered(username);
if (plugin.getConfig().getBoolean("nameChangeCheck")
|| (plugin.getConfig().getBoolean("autoRegister") && isRegistered)) {
premiumUUID = plugin.getCore().getMojangApiConnector().getPremiumUUID(username);
}
@@ -71,7 +72,7 @@ public class NameCheckTask implements Runnable {
}
}
if (premiumUUID != null && plugin.getConfig().getBoolean("autoRegister")) {
if (premiumUUID != null && plugin.getConfig().getBoolean("autoRegister") && !isRegistered) {
plugin.getLogger().log(Level.FINER, "Player {0} uses a premium username", username);
enablePremiumLogin(profile, false);
return;
@@ -47,8 +47,9 @@ public class ProtocolSupportListener implements Listener {
//user not exists in the db
try {
if (plugin.getConfig().getBoolean("nameChangeCheck") || (plugin.getConfig().getBoolean("autoRegister")
&& plugin.getAuthPlugin().isRegistered(username))) {
boolean isRegistered = plugin.getAuthPlugin().isRegistered(username);
if (plugin.getConfig().getBoolean("nameChangeCheck")
|| (plugin.getConfig().getBoolean("autoRegister") && isRegistered)) {
premiumUUID = plugin.getCore().getMojangApiConnector().getPremiumUUID(username);
}
@@ -61,8 +62,7 @@ public class ProtocolSupportListener implements Listener {
}
}
if (premiumUUID != null
&& plugin.getConfig().getBoolean("autoRegister") && !authPlugin.isRegistered(username)) {
if (premiumUUID != null && plugin.getConfig().getBoolean("autoRegister") && !isRegistered) {
plugin.getLogger().log(Level.FINER, "Player {0} uses a premium username", username);
startPremiumSession(username, loginStartEvent, false, profile);
return;