mirror of
https://github.com/plan-player-analytics/Plan.git
synced 2024-09-19 18:21:00 +02:00
Simplifies if statements with && or ||
Removes one not existing argument in a JavaDoc Removes some unnecessary variable assignments Remove the check if an error happened while hashing the password in RegisterCommand.playerRegister because it's not possible that the hash is null Fixes that the command use table isn't limited -> now again limited (Bug caused by my conversion to foreach) More performance by using .computeIfPresent at GeolocationPart.addGeoloc(String)
This commit is contained in:
parent
9719d3097f
commit
06bd3518f6
@ -33,14 +33,14 @@ public class InfoCommand extends SubCommand {
|
|||||||
@Override
|
@Override
|
||||||
public boolean onCommand(ISender sender, String commandLabel, String[] args) {
|
public boolean onCommand(ISender sender, String commandLabel, String[] args) {
|
||||||
ChatColor tColor = Phrase.COLOR_SEC.color();
|
ChatColor tColor = Phrase.COLOR_SEC.color();
|
||||||
String[] messages = {
|
String[] msgs = {
|
||||||
Phrase.CMD_INFO_HEADER + "",
|
Phrase.CMD_INFO_HEADER + "",
|
||||||
Phrase.CMD_INFO_VERSION.parse(plugin.getDescription().getVersion()),
|
Phrase.CMD_INFO_VERSION.parse(plugin.getDescription().getVersion()),
|
||||||
Phrase.CMD_BALL.toString() + tColor + " " + Version.checkVersion(plugin),
|
Phrase.CMD_BALL.toString() + tColor + " " + Version.checkVersion(plugin),
|
||||||
Phrase.CMD_MANAGE_STATUS_ACTIVE_DB.parse(plugin.getDB().getConfigName()),
|
Phrase.CMD_MANAGE_STATUS_ACTIVE_DB.parse(plugin.getDB().getConfigName()),
|
||||||
Phrase.CMD_FOOTER + ""
|
Phrase.CMD_FOOTER + ""
|
||||||
};
|
};
|
||||||
sender.sendMessage(messages);
|
sender.sendMessage(msgs);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ public class RegisterCommand extends SubCommand {
|
|||||||
String permLvlErrorMsg = ChatColor.RED + "Incorrect perm level, not a number: ";
|
String permLvlErrorMsg = ChatColor.RED + "Incorrect perm level, not a number: ";
|
||||||
try {
|
try {
|
||||||
if (CommandUtils.isPlayer(sender)) {
|
if (CommandUtils.isPlayer(sender)) {
|
||||||
Log.info(sender.getName()+" issued WebUser register command.");
|
Log.info(sender.getName() + " issued WebUser register command.");
|
||||||
playerRegister(args, sender);
|
playerRegister(args, sender);
|
||||||
} else {
|
} else {
|
||||||
consoleRegister(args, sender, notEnoughArgsMsg);
|
consoleRegister(args, sender, notEnoughArgsMsg);
|
||||||
@ -74,11 +74,6 @@ public class RegisterCommand extends SubCommand {
|
|||||||
if (registerSenderAsUser) {
|
if (registerSenderAsUser) {
|
||||||
String user = sender.getName();
|
String user = sender.getName();
|
||||||
String pass = PassEncryptUtil.createHash(args[0]);
|
String pass = PassEncryptUtil.createHash(args[0]);
|
||||||
|
|
||||||
if (!Check.isTrue(pass != null, ChatColor.RED + "Password hash error.", sender)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
int permLvl = getPermissionLevel(sender);
|
int permLvl = getPermissionLevel(sender);
|
||||||
registerUser(new WebUser(user, pass, permLvl), sender);
|
registerUser(new WebUser(user, pass, permLvl), sender);
|
||||||
} else if (sender.hasPermission(Permissions.MANAGE_WEB.getPermission())) {
|
} else if (sender.hasPermission(Permissions.MANAGE_WEB.getPermission())) {
|
||||||
@ -119,7 +114,7 @@ public class RegisterCommand extends SubCommand {
|
|||||||
}
|
}
|
||||||
securityTable.addNewUser(webUser);
|
securityTable.addNewUser(webUser);
|
||||||
sender.sendMessage(successMsg);
|
sender.sendMessage(successMsg);
|
||||||
Log.info("Registered new user: "+userName+" Perm level: "+webUser.getPermLevel());
|
Log.info("Registered new user: " + userName + " Perm level: " + webUser.getPermLevel());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.toLog(this.getClass().getName(), e);
|
Log.toLog(this.getClass().getName(), e);
|
||||||
} finally {
|
} finally {
|
||||||
|
@ -28,7 +28,7 @@ public class WebLevelCommand extends SubCommand {
|
|||||||
ColorScheme cs = plugin.getColorScheme();
|
ColorScheme cs = plugin.getColorScheme();
|
||||||
String sCol = cs.getSecondaryColor();
|
String sCol = cs.getSecondaryColor();
|
||||||
String cmdBall = Phrase.CMD_BALL.parse();
|
String cmdBall = Phrase.CMD_BALL.parse();
|
||||||
String[] msgs = new String[]{
|
String[] messages = new String[]{
|
||||||
Phrase.CMD_FOOTER.parse(),
|
Phrase.CMD_FOOTER.parse(),
|
||||||
cmdBall + sCol + "0: Access all pages",
|
cmdBall + sCol + "0: Access all pages",
|
||||||
cmdBall + sCol + "1: Access '/players' and all inspect pages",
|
cmdBall + sCol + "1: Access '/players' and all inspect pages",
|
||||||
@ -36,7 +36,7 @@ public class WebLevelCommand extends SubCommand {
|
|||||||
cmdBall + sCol + "3+: No permissions",
|
cmdBall + sCol + "3+: No permissions",
|
||||||
Phrase.CMD_FOOTER.parse()
|
Phrase.CMD_FOOTER.parse()
|
||||||
};
|
};
|
||||||
sender.sendMessage(msgs);
|
sender.sendMessage(messages);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -84,10 +84,7 @@ public class KillData {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
final KillData other = (KillData) obj;
|
final KillData other = (KillData) obj;
|
||||||
if (this.date != other.date) {
|
return this.date == other.date && Objects.equals(this.weapon, other.weapon) && Objects.equals(this.victim, other.victim);
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return Objects.equals(this.weapon, other.weapon) && Objects.equals(this.victim, other.victim);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -78,10 +78,7 @@ public class TPS {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
final TPS other = (TPS) obj;
|
final TPS other = (TPS) obj;
|
||||||
if (this.date != other.date) {
|
return this.date == other.date && Double.doubleToLongBits(this.tps) == Double.doubleToLongBits(other.tps) && this.players == other.players;
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return Double.doubleToLongBits(this.tps) == Double.doubleToLongBits(other.tps) && this.players == other.players;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -3,19 +3,12 @@ package main.java.com.djrapitops.plan.data;
|
|||||||
import com.djrapitops.plugin.utilities.Verify;
|
import com.djrapitops.plugin.utilities.Verify;
|
||||||
import com.djrapitops.plugin.utilities.player.IOfflinePlayer;
|
import com.djrapitops.plugin.utilities.player.IOfflinePlayer;
|
||||||
import com.djrapitops.plugin.utilities.player.IPlayer;
|
import com.djrapitops.plugin.utilities.player.IPlayer;
|
||||||
import java.net.InetAddress;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
import main.java.com.djrapitops.plan.Log;
|
import main.java.com.djrapitops.plan.Log;
|
||||||
|
|
||||||
|
import java.net.InetAddress;
|
||||||
|
import java.util.*;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class is used for storing information about a player during runtime.
|
* This class is used for storing information about a player during runtime.
|
||||||
*
|
*
|
||||||
@ -800,13 +793,10 @@ public class UserData {
|
|||||||
if (!Objects.equals(this.nicknames, other.nicknames)) {
|
if (!Objects.equals(this.nicknames, other.nicknames)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (!Objects.equals(this.lastGamemode, other.lastGamemode)) {
|
return Objects.equals(this.lastGamemode, other.lastGamemode)
|
||||||
return false;
|
&& Objects.equals(this.gmTimes, other.gmTimes)
|
||||||
}
|
&& Objects.equals(this.playerKills, other.playerKills)
|
||||||
if (!Objects.equals(this.gmTimes, other.gmTimes)) {
|
&& Objects.equals(this.sessions, other.sessions);
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return Objects.equals(this.playerKills, other.playerKills) && Objects.equals(this.sessions, other.sessions);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -294,13 +294,10 @@ public abstract class PluginData {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
final PluginData other = (PluginData) obj;
|
final PluginData other = (PluginData) obj;
|
||||||
if (this.analysisOnly != other.analysisOnly) {
|
return this.analysisOnly == other.analysisOnly
|
||||||
return false;
|
&& Objects.equals(this.placeholder, other.placeholder)
|
||||||
}
|
&& Objects.equals(this.sourcePlugin, other.sourcePlugin)
|
||||||
if (!Objects.equals(this.placeholder, other.placeholder)) {
|
&& Objects.equals(this.analysisTypes, other.analysisTypes);
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return Objects.equals(this.sourcePlugin, other.sourcePlugin) && Objects.equals(this.analysisTypes, other.analysisTypes);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -73,10 +73,7 @@ public class GeolocationPart extends RawData<GeolocationPart> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void addGeoloc(String country) {
|
public void addGeoloc(String country) {
|
||||||
if (geolocations.get(country) == null) {
|
geolocations.computeIfPresent(country, (computedCountry, amount) -> amount + 1);
|
||||||
return;
|
|
||||||
}
|
|
||||||
geolocations.replace(country, geolocations.get(country) + 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,20 +1,17 @@
|
|||||||
package main.java.com.djrapitops.plan.data.cache;
|
package main.java.com.djrapitops.plan.data.cache;
|
||||||
|
|
||||||
import com.djrapitops.plugin.task.AbsRunnable;
|
import com.djrapitops.plugin.task.AbsRunnable;
|
||||||
import com.djrapitops.plugin.task.ITask;
|
|
||||||
import com.djrapitops.plugin.utilities.player.IPlayer;
|
import com.djrapitops.plugin.utilities.player.IPlayer;
|
||||||
import java.sql.SQLException;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.UUID;
|
|
||||||
import main.java.com.djrapitops.plan.Log;
|
import main.java.com.djrapitops.plan.Log;
|
||||||
import main.java.com.djrapitops.plan.Phrase;
|
import main.java.com.djrapitops.plan.Phrase;
|
||||||
import main.java.com.djrapitops.plan.Plan;
|
import main.java.com.djrapitops.plan.Plan;
|
||||||
import main.java.com.djrapitops.plan.Settings;
|
import main.java.com.djrapitops.plan.Settings;
|
||||||
import main.java.com.djrapitops.plan.data.*;
|
import main.java.com.djrapitops.plan.data.TPS;
|
||||||
import main.java.com.djrapitops.plan.data.cache.queue.*;
|
import main.java.com.djrapitops.plan.data.UserData;
|
||||||
|
import main.java.com.djrapitops.plan.data.cache.queue.DataCacheClearQueue;
|
||||||
|
import main.java.com.djrapitops.plan.data.cache.queue.DataCacheGetQueue;
|
||||||
|
import main.java.com.djrapitops.plan.data.cache.queue.DataCacheProcessQueue;
|
||||||
|
import main.java.com.djrapitops.plan.data.cache.queue.DataCacheSaveQueue;
|
||||||
import main.java.com.djrapitops.plan.data.handling.info.HandlingInfo;
|
import main.java.com.djrapitops.plan.data.handling.info.HandlingInfo;
|
||||||
import main.java.com.djrapitops.plan.data.handling.info.LogoutInfo;
|
import main.java.com.djrapitops.plan.data.handling.info.LogoutInfo;
|
||||||
import main.java.com.djrapitops.plan.data.handling.info.ReloadInfo;
|
import main.java.com.djrapitops.plan.data.handling.info.ReloadInfo;
|
||||||
@ -25,6 +22,9 @@ import main.java.com.djrapitops.plan.utilities.NewPlayerCreator;
|
|||||||
import main.java.com.djrapitops.plan.utilities.analysis.MathUtils;
|
import main.java.com.djrapitops.plan.utilities.analysis.MathUtils;
|
||||||
import main.java.com.djrapitops.plan.utilities.comparators.HandlingInfoTimeComparator;
|
import main.java.com.djrapitops.plan.utilities.comparators.HandlingInfoTimeComparator;
|
||||||
|
|
||||||
|
import java.sql.SQLException;
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This Class contains the Cache.
|
* This Class contains the Cache.
|
||||||
*
|
*
|
||||||
@ -131,7 +131,7 @@ public class DataCacheHandler extends SessionCache {
|
|||||||
clearAfterXsaves = configValue;
|
clearAfterXsaves = configValue;
|
||||||
}
|
}
|
||||||
DataCacheHandler handler = this;
|
DataCacheHandler handler = this;
|
||||||
ITask asyncPeriodicCacheSaveTask = plugin.getRunnableFactory().createNew(new AbsRunnable("PeriodicCacheSaveTask") {
|
plugin.getRunnableFactory().createNew(new AbsRunnable("PeriodicCacheSaveTask") {
|
||||||
private int timesSaved = 0;
|
private int timesSaved = 0;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -492,7 +492,7 @@ public class DataCacheHandler extends SessionCache {
|
|||||||
* Calls all the methods that are ran when PlayerJoinEvent is fired
|
* Calls all the methods that are ran when PlayerJoinEvent is fired
|
||||||
*/
|
*/
|
||||||
public void handleReload() {
|
public void handleReload() {
|
||||||
ITask asyncReloadCacheUpdateTask = plugin.getRunnableFactory().createNew(new AbsRunnable("ReloadCacheUpdateTask") {
|
plugin.getRunnableFactory().createNew(new AbsRunnable("ReloadCacheUpdateTask") {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
final List<IPlayer> onlinePlayers = plugin.fetch().getOnlinePlayers();
|
final List<IPlayer> onlinePlayers = plugin.fetch().getOnlinePlayers();
|
||||||
|
@ -1,20 +1,23 @@
|
|||||||
package main.java.com.djrapitops.plan.database.databases;
|
package main.java.com.djrapitops.plan.database.databases;
|
||||||
|
|
||||||
import com.djrapitops.plugin.task.AbsRunnable;
|
import com.djrapitops.plugin.task.AbsRunnable;
|
||||||
|
import main.java.com.djrapitops.plan.Log;
|
||||||
|
import main.java.com.djrapitops.plan.Plan;
|
||||||
|
import main.java.com.djrapitops.plan.data.KillData;
|
||||||
|
import main.java.com.djrapitops.plan.data.SessionData;
|
||||||
|
import main.java.com.djrapitops.plan.data.UserData;
|
||||||
|
import main.java.com.djrapitops.plan.data.cache.DBCallableProcessor;
|
||||||
|
import main.java.com.djrapitops.plan.database.Database;
|
||||||
|
import main.java.com.djrapitops.plan.database.tables.*;
|
||||||
|
import main.java.com.djrapitops.plan.utilities.Benchmark;
|
||||||
|
import main.java.com.djrapitops.plan.utilities.FormatUtils;
|
||||||
|
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import main.java.com.djrapitops.plan.Log;
|
|
||||||
import main.java.com.djrapitops.plan.Plan;
|
|
||||||
import main.java.com.djrapitops.plan.data.*;
|
|
||||||
import main.java.com.djrapitops.plan.data.cache.DBCallableProcessor;
|
|
||||||
import main.java.com.djrapitops.plan.database.Database;
|
|
||||||
import main.java.com.djrapitops.plan.database.tables.*;
|
|
||||||
import main.java.com.djrapitops.plan.utilities.Benchmark;
|
|
||||||
import main.java.com.djrapitops.plan.utilities.FormatUtils;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
@ -52,8 +55,6 @@ public abstract class SQLDB extends Database {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
|
||||||
* @param plugin
|
|
||||||
* @throws IllegalArgumentException
|
* @throws IllegalArgumentException
|
||||||
* @throws IllegalStateException
|
* @throws IllegalStateException
|
||||||
*/
|
*/
|
||||||
|
@ -1,13 +1,14 @@
|
|||||||
package main.java.com.djrapitops.plan.ui.html.tables;
|
package main.java.com.djrapitops.plan.ui.html.tables;
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import main.java.com.djrapitops.plan.Log;
|
import main.java.com.djrapitops.plan.Log;
|
||||||
import main.java.com.djrapitops.plan.ui.html.Html;
|
import main.java.com.djrapitops.plan.ui.html.Html;
|
||||||
import main.java.com.djrapitops.plan.utilities.Benchmark;
|
import main.java.com.djrapitops.plan.utilities.Benchmark;
|
||||||
import main.java.com.djrapitops.plan.utilities.comparators.MapComparator;
|
import main.java.com.djrapitops.plan.utilities.comparators.MapComparator;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author Rsl1122
|
* @author Rsl1122
|
||||||
@ -38,6 +39,7 @@ public class CommandUseTableCreator {
|
|||||||
Log.toLog("SortableCommandUseTableCreator", e);
|
Log.toLog("SortableCommandUseTableCreator", e);
|
||||||
Log.toLog("Cause: " + values[0] + " " + values[1], Log.getErrorsFilename());
|
Log.toLog("Cause: " + values[0] + " " + values[1], Log.getErrorsFilename());
|
||||||
}
|
}
|
||||||
|
i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Benchmark.stop("Create commanduse table");
|
Benchmark.stop("Create commanduse table");
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
package main.java.com.djrapitops.plan.utilities;
|
package main.java.com.djrapitops.plan.utilities;
|
||||||
|
|
||||||
import java.security.NoSuchAlgorithmException;
|
|
||||||
import java.security.SecureRandom;
|
|
||||||
import java.security.spec.InvalidKeySpecException;
|
|
||||||
import javax.crypto.SecretKeyFactory;
|
import javax.crypto.SecretKeyFactory;
|
||||||
import javax.crypto.spec.PBEKeySpec;
|
import javax.crypto.spec.PBEKeySpec;
|
||||||
import javax.xml.bind.DatatypeConverter;
|
import javax.xml.bind.DatatypeConverter;
|
||||||
|
import java.security.NoSuchAlgorithmException;
|
||||||
|
import java.security.SecureRandom;
|
||||||
|
import java.security.spec.InvalidKeySpecException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Password Encryption utility.
|
* Password Encryption utility.
|
||||||
@ -98,7 +98,7 @@ public class PassEncryptUtil {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
int iterations = 0;
|
int iterations;
|
||||||
try {
|
try {
|
||||||
iterations = Integer.parseInt(params[ITERATION_INDEX]);
|
iterations = Integer.parseInt(params[ITERATION_INDEX]);
|
||||||
} catch (NumberFormatException ex) {
|
} catch (NumberFormatException ex) {
|
||||||
@ -113,7 +113,7 @@ public class PassEncryptUtil {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
byte[] salt = null;
|
byte[] salt;
|
||||||
try {
|
try {
|
||||||
salt = fromBase64(params[SALT_INDEX]);
|
salt = fromBase64(params[SALT_INDEX]);
|
||||||
} catch (IllegalArgumentException ex) {
|
} catch (IllegalArgumentException ex) {
|
||||||
@ -122,7 +122,7 @@ public class PassEncryptUtil {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
byte[] hash = null;
|
byte[] hash;
|
||||||
try {
|
try {
|
||||||
hash = fromBase64(params[PBKDF2_INDEX]);
|
hash = fromBase64(params[PBKDF2_INDEX]);
|
||||||
} catch (IllegalArgumentException ex) {
|
} catch (IllegalArgumentException ex) {
|
||||||
@ -131,7 +131,7 @@ public class PassEncryptUtil {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
int storedHashSize = 0;
|
int storedHashSize;
|
||||||
try {
|
try {
|
||||||
storedHashSize = Integer.parseInt(params[HASH_SIZE_INDEX]);
|
storedHashSize = Integer.parseInt(params[HASH_SIZE_INDEX]);
|
||||||
} catch (NumberFormatException ex) {
|
} catch (NumberFormatException ex) {
|
||||||
|
Loading…
Reference in New Issue
Block a user