feedc0de/FastLogin
1
0
Fork 0
forked from TuxCoding/FastLogin
Code Pull Requests Activity

Fix typo in BungeeCord message key

Browse Source
This commit is contained in:
games647
2016-06-16 15:10:25 +02:00
parent 2881689f09
commit b009658eea
10 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
######1.6.1
* Fix message typo in BungeeCord which created a NPE if premium-warning is activated
######1.6
* Add a warning message if the user tries to invoke the premium command

2
bukkit/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.github.games647</groupId>
<artifactId>fastlogin</artifactId>
<version>1.6</version>
<version>1.6.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

1
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/CrackedCommand.java
View File

@ -83,7 +83,6 @@ public class CrackedCommand implements CommandExecutor {
if (profile.isPremium()) {
sender.sendMessage(plugin.getCore().getMessage("remove-premium"));
profile.setPremium(false);
profile.setUuid(null);
Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
@Override
public void run() {

6
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java
View File

@ -64,7 +64,7 @@ public class ForceLoginTask implements Runnable {
if (playerProfile != null) {
playerProfile.setUuid(session.getUuid());
//save cracked players too
playerProfile.setPremium(session.isVerified());
playerProfile.setPremium(true);
storage.save(playerProfile);
}
@ -87,7 +87,7 @@ public class ForceLoginTask implements Runnable {
String generatedPassword = plugin.generateStringPassword(player);
boolean success = authPlugin.forceRegister(player, generatedPassword);
String message = plugin.getCore().getMessage("auto-register");
if (message != null) {
if (success && message != null) {
message = message.replace("%password", generatedPassword);
player.sendMessage(message);
}
@ -100,7 +100,7 @@ public class ForceLoginTask implements Runnable {
boolean success = authPlugin.forceLogin(player);
String message = plugin.getCore().getMessage("auto-login");
if (message != null) {
if (success && message != null) {
player.sendMessage(message);
}

2
bungee/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.github.games647</groupId>
<artifactId>fastlogin</artifactId>
<version>1.6</version>
<version>1.6.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

@ -51,7 +51,7 @@ public class PluginMessageListener implements Listener {
if (playerName.equals(fromPlayer.getName()) && plugin.getConfig().getBoolean("premium-warning")
&& !plugin.getPendingConfirms().contains(fromPlayer.getUniqueId())) {
fromPlayer.sendMessage(TextComponent.fromLegacyText(plugin.getCore().getMessage("premium-warming")));
fromPlayer.sendMessage(TextComponent.fromLegacyText(plugin.getCore().getMessage("premium-warning")));
plugin.getPendingConfirms().add(fromPlayer.getUniqueId());
return;
}

2
core/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.github.games647</groupId>
<artifactId>fastlogin</artifactId>
<version>1.6</version>
<version>1.6.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

@ -79,7 +79,7 @@ public class Storage {
ResultSet resultSet = null;
try {
con = dataSource.getConnection();
loadStmt = con.prepareStatement("SELECT * FROM " + PREMIUM_TABLE + " WHERE Name=?");
loadStmt = con.prepareStatement("SELECT * FROM " + PREMIUM_TABLE + " WHERE Name=? LIMIT 1");
loadStmt.setString(1, name);
resultSet = loadStmt.executeQuery();
@ -120,7 +120,7 @@ public class Storage {
ResultSet resultSet = null;
try {
con = dataSource.getConnection();
loadStmt = con.prepareStatement("SELECT * FROM " + PREMIUM_TABLE + " WHERE UUID=?");
loadStmt = con.prepareStatement("SELECT * FROM " + PREMIUM_TABLE + " WHERE UUID=? LIMIT 1");
loadStmt.setString(1, uuid.toString().replace("-", ""));
resultSet = loadStmt.executeQuery();

2
pom.xml
View File

@ -8,7 +8,7 @@
<packaging>pom</packaging>
<name>FastLogin</name>
<version>1.6</version>
<version>1.6.1</version>
<inceptionYear>2015</inceptionYear>
<url>https://www.spigotmc.org/resources/fastlogin.14153/</url>
<description>

2
universal/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.github.games647</groupId>
<artifactId>fastlogin</artifactId>
<version>1.6</version>
<version>1.6.1</version>
<relativePath>../pom.xml</relativePath>
</parent>