Fix NPE for cracked players on non-bungee environments

This commit is contained in:
games647
2018-05-23 19:14:20 +02:00
parent 084afef899
commit 1c6f4e82e0
2 changed files with 9 additions and 4 deletions

View File

@@ -110,7 +110,7 @@ public class BungeeListener implements PluginMessageListener {
} }
}, 10L); }, 10L);
} else if (type == Type.CRACKED) { } else if (type == Type.CRACKED) {
//we don't start a forcelogin task here so update it manually //we don't start a force login task here so update it manually
plugin.getPremiumPlayers().put(player.getUniqueId(), PremiumStatus.CRACKED); plugin.getPremiumPlayers().put(player.getUniqueId(), PremiumStatus.CRACKED);
} }
} }

View File

@@ -35,11 +35,12 @@ public class ForceLoginTask extends ForceLoginManagement<Player, CommandSender,
super.run(); super.run();
PremiumStatus status = PremiumStatus.CRACKED;
if (isOnlineMode()) { if (isOnlineMode()) {
plugin.getPremiumPlayers().put(player.getUniqueId(), PremiumStatus.PREMIUM); status = PremiumStatus.PREMIUM;
} else {
plugin.getPremiumPlayers().put(player.getUniqueId(), PremiumStatus.CRACKED);
} }
plugin.getPremiumPlayers().put(player.getUniqueId(), status);
} }
@Override @Override
@@ -67,6 +68,10 @@ public class ForceLoginTask extends ForceLoginManagement<Player, CommandSender,
@Override @Override
public boolean isOnlineMode() { public boolean isOnlineMode() {
if (session == null) {
return false;
}
return session.isVerified() && player.getName().equals(session.getUsername()); return session.isVerified() && player.getName().equals(session.getUsername());
} }
} }