Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codestyle cleanup

Browse Source
This commit is contained in:
sgdc3 2017-09-27 15:16:33 +02:00
parent 83b5a3d66d
commit 920e65c4f4
10 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/fr/xephi/authme/api/v3/AuthMeApi.java
View File

@ -18,7 +18,6 @@ import org.bukkit.entity.Player;
import javax.inject.Inject; import javax.inject.Inject;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;

6
src/main/java/fr/xephi/authme/datasource/SQLite.java
View File

@ -430,9 +430,10 @@ public class SQLite implements DataSource {
try (PreparedStatement pst = con.prepareStatement(sql)) { try (PreparedStatement pst = con.prepareStatement(sql)) {
pst.setString(1, user); pst.setString(1, user);
try (ResultSet rs = pst.executeQuery()) { try (ResultSet rs = pst.executeQuery()) {
if (rs.next()) if (rs.next()) {
return rs.getInt(col.IS_LOGGED) == 1; return rs.getInt(col.IS_LOGGED) == 1;
} }
}
} catch (SQLException ex) { } catch (SQLException ex) {
logSqlException(ex); logSqlException(ex);
} }
@ -454,7 +455,7 @@ public class SQLite implements DataSource {
@Override @Override
public void setUnlogged(String user) { public void setUnlogged(String user) {
String sql = "UPDATE " + tableName + " SET " + col.IS_LOGGED + "=? WHERE LOWER(" + col.NAME + ")=?;"; String sql = "UPDATE " + tableName + " SET " + col.IS_LOGGED + "=? WHERE LOWER(" + col.NAME + ")=?;";
if (user != null) if (user != null) {
try (PreparedStatement pst = con.prepareStatement(sql)) { try (PreparedStatement pst = con.prepareStatement(sql)) {
pst.setInt(1, 0); pst.setInt(1, 0);
pst.setString(2, user); pst.setString(2, user);
@ -463,6 +464,7 @@ public class SQLite implements DataSource {
logSqlException(ex); logSqlException(ex);
} }
} }
}
@Override @Override
public void purgeLogged() { public void purgeLogged() {

6
src/main/java/fr/xephi/authme/datasource/converter/XAuthConverter.java
View File

@ -86,8 +86,9 @@ public class XAuthConverter implements Converter {
ps = conn.prepareStatement(sql); ps = conn.prepareStatement(sql);
ps.setInt(1, id); ps.setInt(1, id);
rs = ps.executeQuery(); rs = ps.executeQuery();
if (!rs.next()) if (!rs.next()) {
return null; return null;
}
realPass = rs.getString("playername").toLowerCase(); realPass = rs.getString("playername").toLowerCase();
} catch (SQLException e) { } catch (SQLException e) {
xAuthLog.severe("Failed to retrieve name for account: " + id, e); xAuthLog.severe("Failed to retrieve name for account: " + id, e);
@ -131,8 +132,9 @@ public class XAuthConverter implements Converter {
ps = conn.prepareStatement(sql); ps = conn.prepareStatement(sql);
ps.setInt(1, accountId); ps.setInt(1, accountId);
rs = ps.executeQuery(); rs = ps.executeQuery();
if (!rs.next()) if (!rs.next()) {
return null; return null;
}
realPass = rs.getString("password"); realPass = rs.getString("password");
} catch (SQLException e) { } catch (SQLException e) {
xAuthLog.severe("Failed to retrieve password hash for account: " + accountId, e); xAuthLog.severe("Failed to retrieve password hash for account: " + accountId, e);

2
src/main/java/fr/xephi/authme/permission/handlers/PermissionHandler.java
View File

@ -4,11 +4,9 @@ import fr.xephi.authme.permission.PermissionNode;
import fr.xephi.authme.permission.PermissionsSystemType; import fr.xephi.authme.permission.PermissionsSystemType;
import fr.xephi.authme.util.Utils; import fr.xephi.authme.util.Utils;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
import java.util.Collection; import java.util.Collection;
public interface PermissionHandler { public interface PermissionHandler {
/** /**

1
src/main/java/fr/xephi/authme/permission/handlers/PermissionsExHandler.java
View File

@ -3,7 +3,6 @@ package fr.xephi.authme.permission.handlers;
import fr.xephi.authme.permission.PermissionNode; import fr.xephi.authme.permission.PermissionNode;
import fr.xephi.authme.permission.PermissionsSystemType; import fr.xephi.authme.permission.PermissionsSystemType;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
import ru.tehkode.permissions.PermissionManager; import ru.tehkode.permissions.PermissionManager;
import ru.tehkode.permissions.PermissionUser; import ru.tehkode.permissions.PermissionUser;
import ru.tehkode.permissions.bukkit.PermissionsEx; import ru.tehkode.permissions.bukkit.PermissionsEx;

3
src/main/java/fr/xephi/authme/settings/WelcomeMessageConfiguration.java
View File

@ -9,6 +9,7 @@ import fr.xephi.authme.service.GeoIpService;
import fr.xephi.authme.util.PlayerUtils; import fr.xephi.authme.util.PlayerUtils;
import fr.xephi.authme.util.lazytags.Tag; import fr.xephi.authme.util.lazytags.Tag;
import fr.xephi.authme.util.lazytags.TagReplacer; import fr.xephi.authme.util.lazytags.TagReplacer;
import org.bukkit.ChatColor;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -48,7 +49,7 @@ public class WelcomeMessageConfiguration implements Reloadable {
/** List of all supported tags for the welcome message. */ /** List of all supported tags for the welcome message. */
private final List<Tag<Player>> availableTags = Arrays.asList( private final List<Tag<Player>> availableTags = Arrays.asList(
createTag("&", () -> "\u00a7"), createTag("&", () -> String.valueOf(ChatColor.COLOR_CHAR)),
createTag("{PLAYER}", pl -> pl.getName()), createTag("{PLAYER}", pl -> pl.getName()),
createTag("{ONLINE}", () -> Integer.toString(bukkitService.getOnlinePlayers().size())), createTag("{ONLINE}", () -> Integer.toString(bukkitService.getOnlinePlayers().size())),
createTag("{MAXPLAYERS}", () -> Integer.toString(server.getMaxPlayers())), createTag("{MAXPLAYERS}", () -> Integer.toString(server.getMaxPlayers())),