EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 05:06:45 +01:00
Code Issues Projects Releases Wiki Activity

Useless casting and elses.

Browse Source
This commit is contained in:
GJ 2013-07-11 12:49:01 -04:00
parent d07b67b5bf
commit 68727496ad
3 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java
View File

@ -17,22 +17,16 @@ public class MmoshowdbCommand implements TabExecutor {
if (args.length != 0) {
return false;
}
else {
Class<?> clazz = DatabaseManagerFactory.getCustomDatabaseManagerClass();
if (clazz != null) {
sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", clazz.getName()));
return true;
}
else {
if (Config.getInstance().getUseMySQL()) {
sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", "sql"));
}
else {
sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", "flatfile"));
}
return true;
}
Class<?> clazz = DatabaseManagerFactory.getCustomDatabaseManagerClass();
if (clazz != null) {
sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", clazz.getName()));
return true;
}
sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", (Config.getInstance().getUseMySQL() ? "sql" : "flatfile")));
return true;
}
@Override

9
src/main/java/com/gmail/nossr50/commands/database/MmoupdateCommand.java
View File

@ -47,7 +47,7 @@ public class MmoupdateCommand implements TabExecutor {
else try {
@SuppressWarnings("unchecked")
Class<? extends DatabaseManager> clazz = (Class<? extends DatabaseManager>) Class.forName(oldType);
oldDb = DatabaseManagerFactory.createCustomDatabaseManager((Class<? extends DatabaseManager>) clazz);
oldDb = DatabaseManagerFactory.createCustomDatabaseManager(clazz);
oldType = clazz.getSimpleName(); // For pretty-printing; we have the database now
}
@ -119,12 +119,7 @@ public class MmoupdateCommand implements TabExecutor {
return DatabaseManagerFactory.getCustomDatabaseManagerClass().getSimpleName();
}
if (Config.getInstance().getUseMySQL()) {
return "sql";
}
else {
return "flatfile";
}
return Config.getInstance().getUseMySQL() ? "sql" : "flatfile";
}
@Override

6
src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java
View File

@ -379,11 +379,9 @@ public final class SQLDatabaseManager implements DatabaseManager {
// There is no such user
if (create) {
newUser(playerName);
return new PlayerProfile(playerName, true);
}
else {
return new PlayerProfile(playerName, false);
}
return new PlayerProfile(playerName, create);
}
// There is such a user
writeMissingRows(id);