From adcd70b91dc7db2308da8cbe91daf2f4c8e01577 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Sat, 21 Nov 2015 01:15:52 +0100 Subject: [PATCH] auto cleanup --- .../executable/authme/AccountsCommand.java | 4 ++-- .../authme/process/login/AsyncronousLogin.java | 2 +- .../login/ProcessSyncronousPlayerLogin.java | 1 - .../fr/xephi/authme/security/crypts/BCRYPT.java | 16 ++++++++-------- .../fr/xephi/authme/security/crypts/PHPBB.java | 2 +- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java index ad29b365..2145aa91 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java @@ -71,7 +71,7 @@ public class AccountsCommand extends ExecutableCommand { if (i != accountList.size()) { message.append(", "); } else { - message.append("."); + message.append('.'); } } sender.sendMessage("[AuthMe] " + playerQueryFinal + " has " + String.valueOf(accountList.size()) + " accounts"); @@ -109,7 +109,7 @@ public class AccountsCommand extends ExecutableCommand { if (i != accountList.size()) { message.append(", "); } else { - message.append("."); + message.append('.'); } } sender.sendMessage("[AuthMe] " + playerQueryFinal + " has " + String.valueOf(accountList.size()) + " accounts"); diff --git a/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java b/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java index 4144bd08..012c69e0 100644 --- a/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java +++ b/src/main/java/fr/xephi/authme/process/login/AsyncronousLogin.java @@ -226,7 +226,7 @@ public class AsyncronousLogin { if (i != auths.size()) { message.append(", "); } else { - message.append("."); + message.append('.'); } } /* diff --git a/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java b/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java index 41318843..ab98e281 100644 --- a/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java +++ b/src/main/java/fr/xephi/authme/process/login/ProcessSyncronousPlayerLogin.java @@ -1,7 +1,6 @@ package fr.xephi.authme.process.login; import org.bukkit.Bukkit; -import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; diff --git a/src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java b/src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java index 7f420c00..a84d774a 100644 --- a/src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java +++ b/src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java @@ -247,8 +247,8 @@ public class BCRYPT implements EncryptionMethod { * Initialise the Blowfish key schedule */ private void init_key() { - P = (int[]) P_orig.clone(); - S = (int[]) S_orig.clone(); + P = P_orig.clone(); + S = S_orig.clone(); } /** @@ -323,7 +323,7 @@ public class BCRYPT implements EncryptionMethod { */ private byte[] crypt_raw(byte password[], byte salt[], int log_rounds) { int rounds, i, j; - int cdata[] = (int[]) bf_crypt_ciphertext.clone(); + int cdata[] = bf_crypt_ciphertext.clone(); int clen = cdata.length; byte ret[]; @@ -401,11 +401,11 @@ public class BCRYPT implements EncryptionMethod { rs.append("$2"); if (minor >= 'a') rs.append(minor); - rs.append("$"); + rs.append('$'); if (rounds < 10) - rs.append("0"); + rs.append('0'); rs.append(Integer.toString(rounds)); - rs.append("$"); + rs.append('$'); rs.append(encode_base64(saltb, saltb.length)); rs.append(encode_base64(hashed, bf_crypt_ciphertext.length * 4 - 1)); return rs.toString(); @@ -427,9 +427,9 @@ public class BCRYPT implements EncryptionMethod { rs.append("$2a$"); if (log_rounds < 10) - rs.append("0"); + rs.append('0'); rs.append(Integer.toString(log_rounds)); - rs.append("$"); + rs.append('$'); rs.append(encode_base64(rnd, rnd.length)); return rs.toString(); } diff --git a/src/main/java/fr/xephi/authme/security/crypts/PHPBB.java b/src/main/java/fr/xephi/authme/security/crypts/PHPBB.java index cc5d4dc3..6defebf7 100644 --- a/src/main/java/fr/xephi/authme/security/crypts/PHPBB.java +++ b/src/main/java/fr/xephi/authme/security/crypts/PHPBB.java @@ -122,7 +122,7 @@ public class PHPBB implements EncryptionMethod { for (byte b : bytes) { String x = Integer.toHexString(b & 0xff); if (x.length() < 2) - r.append("0"); + r.append('0'); r.append(x); } return r.toString();