TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-29 18:27:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use a better method name for StoredProfile.isPremium

Browse Source
This commit is contained in:
games647
2024-05-10 10:09:12 +02:00
parent 204d25a739
commit 756b777056
8 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/CrackedCommand.java
View File

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

4
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/PremiumCommand.java
View File

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

2
bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java
View File

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

4
bungee/src/main/java/com/github/games647/fastlogin/bungee/task/AsyncToggleMessage.java
View File

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

4
core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java
View File

@ -81,7 +81,7 @@ public abstract class ForceLoginManagement<P extends C, C, L extends LoginSessio
//update only on success to prevent corrupt data
if (playerProfile != null) {
playerProfile.setId(session.getUuid());
playerProfile.setPremium(true);
playerProfile.setOnlinemodePreferred(true);
storage.save(playerProfile);
}
@ -91,7 +91,7 @@ public abstract class ForceLoginManagement<P extends C, C, L extends LoginSessio
} else if (playerProfile != null) {
//cracked player
playerProfile.setId(null);
playerProfile.setPremium(false);
playerProfile.setOnlinemodePreferred(false);
storage.save(playerProfile);
}
} catch (Exception ex) {

35
core/src/main/java/com/github/games647/fastlogin/core/storage/StoredProfile.java
View File

@ -97,19 +97,42 @@ public class StoredProfile extends Profile {
this.id = uniqueId;
}
/**
* @return whether the online mode should be enabled for this player
* @deprecated {@link #isOnlinemodePreferred()} is recommended, because the name represents more its
* meaning
*/
@Deprecated
public synchronized boolean isPremium() {
return premium;
}
/**
* Return the online mode preference for this player.
* <p>
* <b>
* 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.
* </b>
*
* @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();
}
}

2
velocity/src/main/java/com/github/games647/fastlogin/velocity/listener/PluginMessageListener.java
View File

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

4
velocity/src/main/java/com/github/games647/fastlogin/velocity/task/AsyncToggleMessage.java
View File

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