diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/CrackedCommand.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/CrackedCommand.java index 5f8f9da5..69632b17 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/CrackedCommand.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/CrackedCommand.java @@ -66,7 +66,7 @@ public class CrackedCommand extends ToggleCommand { if (profile.isOnlinemodePreferred()) { plugin.getCore().sendLocaleMessage("remove-premium", sender); - profile.setPremium(false); + profile.setOnlinemodePreferred(false); profile.setId(null); plugin.getScheduler().runAsync(() -> { plugin.getCore().getStorage().save(profile); @@ -100,7 +100,7 @@ public class CrackedCommand extends ToggleCommand { } else { plugin.getCore().sendLocaleMessage("remove-premium", sender); - profile.setPremium(false); + profile.setOnlinemodePreferred(false); plugin.getScheduler().runAsync(() -> { plugin.getCore().getStorage().save(profile); plugin.getServer().getPluginManager().callEvent( diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/PremiumCommand.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/PremiumCommand.java index cbf1ee2a..6f132271 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/PremiumCommand.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/PremiumCommand.java @@ -82,7 +82,7 @@ public class PremiumCommand extends ToggleCommand { plugin.getCore().sendLocaleMessage("already-exists", sender); } else { //todo: resolve uuid - profile.setPremium(true); + profile.setOnlinemodePreferred(true); plugin.getScheduler().runAsync(() -> { plugin.getCore().getStorage().save(profile); plugin.getServer().getPluginManager().callEvent( @@ -113,7 +113,7 @@ public class PremiumCommand extends ToggleCommand { plugin.getCore().sendLocaleMessage("already-exists-other", sender); } else { //todo: resolve uuid - profile.setPremium(true); + profile.setOnlinemodePreferred(true); plugin.getScheduler().runAsync(() -> { plugin.getCore().getStorage().save(profile); plugin.getServer().getPluginManager().callEvent( diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java index 9ea789da..bb4ca89d 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java @@ -131,7 +131,7 @@ public class PluginMessageListener implements Listener { loginSession.setRegistered(true); if (!loginSession.isAlreadySaved()) { - playerProfile.setPremium(true); + playerProfile.setOnlinemodePreferred(true); plugin.getCore().getStorage().save(playerProfile); loginSession.setAlreadySaved(true); } diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncToggleMessage.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncToggleMessage.java index 309758dc..ad372776 100644 --- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncToggleMessage.java +++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncToggleMessage.java @@ -69,7 +69,7 @@ public class AsyncToggleMessage implements Runnable { return; } - playerProfile.setPremium(false); + playerProfile.setOnlinemodePreferred(false); playerProfile.setId(null); core.getStorage().save(playerProfile); PremiumToggleReason reason = (!isPlayerSender || !sender.getName().equalsIgnoreCase(playerProfile.getName())) @@ -86,7 +86,7 @@ public class AsyncToggleMessage implements Runnable { return; } - playerProfile.setPremium(true); + playerProfile.setOnlinemodePreferred(true); core.getStorage().save(playerProfile); PremiumToggleReason reason = (!isPlayerSender || !sender.getName().equalsIgnoreCase(playerProfile.getName())) ? PremiumToggleReason.COMMAND_OTHER : PremiumToggleReason.COMMAND_SELF; diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java index d2e01d9a..863d9803 100644 --- a/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java @@ -81,7 +81,7 @@ public abstract class ForceLoginManagement

+ * + * Note: {@code false} doesn't represent that the player is offline. It could also mean that the player is premium, + * but didn't activated the premium login mode yet. + * + * + * @return whether the online mode should be enabled for this player + */ public synchronized boolean isOnlinemodePreferred() { return premium; } + /** + * @deprecated {@link #setOnlinemodePreferred(boolean)} is recommended, because of the better method name + */ + @Deprecated public synchronized void setPremium(boolean premium) { this.premium = premium; } + public synchronized void setOnlinemodePreferred(boolean premium) { + this.premium = premium; + } + public synchronized FloodgateState getFloodgate() { return floodgate; } @@ -165,11 +188,11 @@ public class StoredProfile extends Profile { @Override public synchronized String toString() { return this.getClass().getSimpleName() + '{' - + "rowId=" + rowId - + ", premium=" + premium - + ", floodgate=" + floodgate - + ", lastIp='" + lastIp + '\'' - + ", lastLogin=" + lastLogin - + "} " + super.toString(); + + "rowId=" + rowId + + ", premium=" + premium + + ", floodgate=" + floodgate + + ", lastIp='" + lastIp + '\'' + + ", lastLogin=" + lastLogin + + "} " + super.toString(); } } diff --git a/velocity/src/main/java/com/github/games647/fastlogin/velocity/listener/PluginMessageListener.java b/velocity/src/main/java/com/github/games647/fastlogin/velocity/listener/PluginMessageListener.java index c9b0d3e8..12b19f60 100644 --- a/velocity/src/main/java/com/github/games647/fastlogin/velocity/listener/PluginMessageListener.java +++ b/velocity/src/main/java/com/github/games647/fastlogin/velocity/listener/PluginMessageListener.java @@ -131,7 +131,7 @@ public class PluginMessageListener { StoredProfile playerProfile = loginSession.getProfile(); loginSession.setRegistered(true); if (!loginSession.isAlreadySaved()) { - playerProfile.setPremium(true); + playerProfile.setOnlinemodePreferred(true); plugin.getCore().getStorage().save(playerProfile); loginSession.setAlreadySaved(true); } diff --git a/velocity/src/main/java/com/github/games647/fastlogin/velocity/task/AsyncToggleMessage.java b/velocity/src/main/java/com/github/games647/fastlogin/velocity/task/AsyncToggleMessage.java index c0d9a671..185b6e51 100644 --- a/velocity/src/main/java/com/github/games647/fastlogin/velocity/task/AsyncToggleMessage.java +++ b/velocity/src/main/java/com/github/games647/fastlogin/velocity/task/AsyncToggleMessage.java @@ -75,7 +75,7 @@ public class AsyncToggleMessage implements Runnable { return; } - playerProfile.setPremium(false); + playerProfile.setOnlinemodePreferred(false); playerProfile.setId(null); core.getStorage().save(playerProfile); PremiumToggleReason reason = (!isPlayerSender || !senderName.equalsIgnoreCase(playerProfile.getName())) @@ -92,7 +92,7 @@ public class AsyncToggleMessage implements Runnable { return; } - playerProfile.setPremium(true); + playerProfile.setOnlinemodePreferred(true); core.getStorage().save(playerProfile); PremiumToggleReason reason = (!isPlayerSender || !senderName.equalsIgnoreCase(playerProfile.getName())) ? PremiumToggleReason.COMMAND_OTHER : PremiumToggleReason.COMMAND_SELF;