Skip to content

Commit

Permalink
doesRecordExistUnderName() removal
Browse files Browse the repository at this point in the history 
This method was stupid, and only served to clog up the code.

An extra query made against the SQL server which is redundant,
considering that the getUUID() method essentially performs the same
task.

With the removal of doesRecordExistUnderName(), I can rename
doesRecorExistUnderUUID() to simply doesRecordExist().
  • Loading branch information
FerusGrim committed May 2, 2014
1 parent d44c3ef commit e5da92d
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 102 deletions.
26 changes: 11 additions & 15 deletions src/main/java/io/github/ferusgrim/GrimList/Commands/AddPlayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,23 +46,19 @@ public boolean run(CommandSender sender, String name) {
}
break;
case "mysql":
if (plugin.mysqlm.doesRecordExistUnderName(name)) {
String uuid = plugin.mysqlm.getUUID(name);
if (uuid.isEmpty()) {
runOperation(sender, name);
String uuid = plugin.mysqlm.getUUID(name);
if (uuid.isEmpty()) {
runOperation(sender, name);
} else {
if (plugin.mysqlm.isPlayerWhitelisted(uuid)) {
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Player is already whitelisted!");
} else {
if (plugin.mysqlm.isPlayerWhitelisted(uuid)) {
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Player is already whitelisted!");
} else {
plugin.mysqlm.addPlayerToWhitelist(uuid, name);
if (plugin.getConfig().getBoolean("LogUsage.Add")) {
plugin.mysqlm.addCommandLog(name, uuid, "/whitelist add " + name, (sender instanceof Player ? plugin.getServer().getPlayerExact(sender.getName()).getUniqueId().toString() : "CONSOLE"), sender.getName());
}
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Player was added to the whitelist!");
plugin.mysqlm.addPlayerToWhitelist(uuid, name);
if (plugin.getConfig().getBoolean("LogUsage.Add")) {
plugin.mysqlm.addCommandLog(name, uuid, "/whitelist add " + name, (sender instanceof Player ? plugin.getServer().getPlayerExact(sender.getName()).getUniqueId().toString() : "CONSOLE"), sender.getName());
}
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Player was added to the whitelist!");
}
} else {
runOperation(sender, name);
}
break;
}
Expand Down Expand Up @@ -103,7 +99,7 @@ protected void execSyncThen() {
}
break;
case "mysql":
if (plugin.mysqlm.doesRecordExistUnderUUID(uuid)) {
if (plugin.mysqlm.doesRecordExist(uuid)) {
if (plugin.mysqlm.isPlayerWhitelisted(uuid)) {
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Player is already whitelisted!");
} else {
Expand Down
18 changes: 7 additions & 11 deletions src/main/java/io/github/ferusgrim/GrimList/Commands/DeleteRecord.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,13 @@ public boolean run(CommandSender sender, String name) {
}
break;
case "mysql":
if (plugin.mysqlm.doesRecordExistUnderName(name)) {
String uuid = plugin.mysqlm.getUUID(name);
if (uuid.isEmpty()) {
runOperation(sender, name);
} else {
plugin.mysqlm.deletePlayerFromRecord(uuid);
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Player record was deleted!");
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "UUID: (" + uuid + ")");
}
} else {
String uuid = plugin.mysqlm.getUUID(name);
if (uuid.isEmpty()) {
runOperation(sender, name);
} else {
plugin.mysqlm.deletePlayerFromRecord(uuid);
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Player record was deleted!");
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "UUID: (" + uuid + ")");
}
break;
}
Expand Down Expand Up @@ -107,7 +103,7 @@ protected void execSyncThen() {
}
break;
case "mysql":
if (plugin.mysqlm.doesRecordExistUnderUUID(uuid)) {
if (plugin.mysqlm.doesRecordExist(uuid)) {
plugin.mysqlm.deletePlayerFromRecord(uuid);
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Player record was deleted!");
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "UUID: (" + uuid + ")");
Expand Down
16 changes: 7 additions & 9 deletions src/main/java/io/github/ferusgrim/GrimList/Commands/GetUUID.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,12 @@ public boolean run(CommandSender sender, String name) {
}
break;
case "mysql":
if (plugin.mysqlm.doesRecordExistUnderName(name)) {
String uuid = plugin.mysqlm.getUUID(name);
if (uuid.isEmpty()) {
runOperation(sender, name);
} else {
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "UUID of " + name + ":");
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + uuid);
}
String uuid = plugin.mysqlm.getUUID(name);
if (uuid.isEmpty()) {
runOperation(sender, name);
} else {
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "UUID of " + name + ":");
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + uuid);
}
}
}
Expand Down Expand Up @@ -89,7 +87,7 @@ protected void execSyncThen() {
}
break;
case "mysql":
if (!plugin.mysqlm.doesRecordExistUnderUUID(uuid)) {
if (!plugin.mysqlm.doesRecordExist(uuid)) {
plugin.mysqlm.createRecordFromQuery(uuid, name);
}
break;
Expand Down
38 changes: 15 additions & 23 deletions src/main/java/io/github/ferusgrim/GrimList/Commands/RemovePlayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,31 +53,23 @@ public boolean run(CommandSender sender, String name) {
}
break;
case "mysql":
if (plugin.mysqlm.doesRecordExistUnderName(name)) {
String uuid = plugin.mysqlm.getUUID(name);
if (uuid.isEmpty()) {
if (plugin.getConfig().getBoolean("SaveQueries")) {
runOperation(sender, name);
} else {
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Player isn't whitelisted!");
}
String uuid = plugin.mysqlm.getUUID(name);
if (uuid.isEmpty()) {
if (plugin.getConfig().getBoolean("SaveQueries")) {
runOperation(sender, name);
} else {
if (plugin.mysqlm.isPlayerWhitelisted(uuid)) {
plugin.mysqlm.removePlayerFromWhitelist(uuid, name);
if (plugin.getConfig().getBoolean("LogUsage.Remove")) {
plugin.mysqlm.addCommandLog(name, uuid, "/whitelist remove " + name, (sender instanceof Player ? plugin.getServer().getPlayerExact(sender.getName()).getUniqueId().toString() : "CONSOLE"), sender.getName());
}
if (plugin.getConfig().getBoolean("KickRemove") && plugin.getServer().getPlayerExact(name) != null) {
plugin.getServer().getPlayerExact(name).kickPlayer(plugin.mStart + "You were removed from the whitelist!");
}
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Player has been removed from the whitelist!");
} else {
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Player isn't whitelisted!");
}
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Player isn't whitelisted!");
}
} else {
if (plugin.getConfig().getBoolean("SaveQueries")) {
runOperation(sender, name);
if (plugin.mysqlm.isPlayerWhitelisted(uuid)) {
plugin.mysqlm.removePlayerFromWhitelist(uuid, name);
if (plugin.getConfig().getBoolean("LogUsage.Remove")) {
plugin.mysqlm.addCommandLog(name, uuid, "/whitelist remove " + name, (sender instanceof Player ? plugin.getServer().getPlayerExact(sender.getName()).getUniqueId().toString() : "CONSOLE"), sender.getName());
}
if (plugin.getConfig().getBoolean("KickRemove") && plugin.getServer().getPlayerExact(name) != null) {
plugin.getServer().getPlayerExact(name).kickPlayer(plugin.mStart + "You were removed from the whitelist!");
}
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Player has been removed from the whitelist!");
} else {
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Player isn't whitelisted!");
}
Expand Down Expand Up @@ -131,7 +123,7 @@ protected void execSyncThen() {
}
break;
case "mysql":
if (plugin.mysqlm.doesRecordExistUnderUUID(uuid)) {
if (plugin.mysqlm.doesRecordExist(uuid)) {
if (plugin.mysqlm.isPlayerWhitelisted(uuid)) {
plugin.mysqlm.removePlayerFromWhitelist(uuid, name);
if (plugin.getConfig().getBoolean("LogUsage.Remove")) {
Expand Down
22 changes: 7 additions & 15 deletions src/main/java/io/github/ferusgrim/GrimList/Commands/ViewPlayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,13 @@ public boolean run(CommandSender sender, String name) {
}
break;
case "mysql":
if (plugin.mysqlm.doesRecordExistUnderName(name)) {
String uuid = plugin.mysqlm.getUUID(name);
if (uuid.isEmpty()) {
runOperation(sender, name);
} else {
plugin.mysqlm.doViewPlayer(sender, uuid);
if (plugin.getConfig().getBoolean("LogUsage.View")) {
plugin.mysqlm.addCommandLog(name, uuid, "/whitelist view " + name, (sender instanceof Player ? plugin.getServer().getPlayerExact(sender.getName()).getUniqueId().toString() : "CONSOLE"), sender.getName());
}
}
String uuid = plugin.mysqlm.getUUID(name);
if (uuid.isEmpty()) {
runOperation(sender, name);
} else {
if (plugin.getConfig().getBoolean("SaveQueries")) {
runOperation(sender, name);
} else {
sender.sendMessage((sender instanceof Player ? plugin.mStart : "") + "Player record doesn't exist!");
plugin.mysqlm.doViewPlayer(sender, uuid);
if (plugin.getConfig().getBoolean("LogUsage.View")) {
plugin.mysqlm.addCommandLog(name, uuid, "/whitelist view " + name, (sender instanceof Player ? plugin.getServer().getPlayerExact(sender.getName()).getUniqueId().toString() : "CONSOLE"), sender.getName());
}
}
break;
Expand Down Expand Up @@ -105,7 +97,7 @@ protected void execSyncThen() {
}
break;
case "mysql":
if (plugin.mysqlm.doesRecordExistUnderUUID(uuid)) {
if (plugin.mysqlm.doesRecordExist(uuid)) {
plugin.mysqlm.doViewPlayer(sender, uuid);
if (plugin.getConfig().getBoolean("LogUsage.View")) {
plugin.mysqlm.addCommandLog(name, uuid, "/whitelist view " + name, (sender instanceof Player ? plugin.getServer().getPlayerExact(sender.getName()).getUniqueId().toString() : "CONSOLE"), sender.getName());
Expand Down
29 changes: 1 addition & 28 deletions src/main/java/io/github/ferusgrim/GrimList/FocusManagers/MySQLManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,34 +210,7 @@ public void addNewAddress(String uuid, String address) {
executeUpdate(sql);
}

public boolean doesRecordExistUnderName(String name) {
Connection conn = null;
PreparedStatement ps = null;
try {
conn = sqlConnection();
ps = conn.prepareStatement("SELECT COUNT(*) FROM `" + database + "`.`playerdata` WHERE `playerdata`.`uuid` = ?;");
ps.setString(1, name);
ResultSet rs = ps.executeQuery();
if (rs.next()) {
if (rs.getInt(1) > 1) {
plugin.log("WARNING", "Discovered multiple UUIDs with the same lastUsername!");
}
if (rs.getInt(1) < 1) {
clean(conn, ps);
return false;
}
} else {
clean(conn, ps);
return false;
}
} catch (SQLException e) {
e.printStackTrace();
}
clean(conn, ps);
return true;
}

public boolean doesRecordExistUnderUUID(String uuid) {
public boolean doesRecordExist(String uuid) {
Connection conn = null;
PreparedStatement ps = null;
try {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/github/ferusgrim/GrimList/PlayerManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void onPlayerLogin(PlayerLoginEvent event) {
denyUser = !plugin.filem.isPlayerWhitelisted(uuid);
break;
case "mysql":
if (plugin.mysqlm.doesRecordExistUnderUUID(uuid)) {
if (plugin.mysqlm.doesRecordExist(uuid)) {
plugin.mysqlm.alterRecordOnLogin(uuid, playerName, playerAddress);
} else {
plugin.mysqlm.createRecordFromLogin(uuid, playerName, playerAddress);
Expand Down

0 comments on commit e5da92d

Please sign in to comment.