EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-04 11:03:43 +01:00
Code Issues Projects Releases Wiki Activity

Remove deprecated PlayerProfile constructor

Browse Source
This commit is contained in:
Shane Freeder
2019-10-06 01:03:07 +01:00
parent d2028321d4
commit 143714c9eb
4 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mcmmo-core/src/main/java/com/gmail/nossr50/database/FlatFileDatabaseManager.java
View File

@@ -530,11 +530,6 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
// Didn't find the player, create a new one // Didn't find the player, create a new one
if (create) { if (create) {
if (uuid == null) {
newUser(playerName, uuid);
return new PlayerProfile(pluginRef, playerName, true);
}
newUser(playerName, uuid); newUser(playerName, uuid);
return new PlayerProfile(pluginRef, playerName, uuid, true); return new PlayerProfile(pluginRef, playerName, uuid, true);
} }
@@ -554,10 +549,6 @@ public final class FlatFileDatabaseManager implements DatabaseManager {
} }
// Return unloaded profile // Return unloaded profile
if (uuid == null) {
return new PlayerProfile(pluginRef, playerName);
}
return new PlayerProfile(pluginRef, playerName, uuid); return new PlayerProfile(pluginRef, playerName, uuid);
} }

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

@@ -564,10 +564,10 @@ public final class SQLDatabaseManager implements DatabaseManager {
id = newUser(connection, playerName, uuid); id = newUser(connection, playerName, uuid);
create = false; create = false;
if (id == -1) { if (id == -1) {
return new PlayerProfile(pluginRef, playerName, false); return new PlayerProfile(pluginRef, playerName, uuid, false);
} }
} else { } else {
return new PlayerProfile(pluginRef, playerName, false); return new PlayerProfile(pluginRef, playerName, uuid,false);
} }
} }
// There is such a user // There is such a user
@@ -634,7 +634,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
// return unloaded profile // return unloaded profile
if (!retry) { if (!retry) {
return new PlayerProfile(pluginRef, playerName, false); return new PlayerProfile(pluginRef, playerName, uuid, false);
} }
// Retry, and abort on re-failure // Retry, and abort on re-failure

6
mcmmo-core/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java
View File

@@ -60,12 +60,6 @@ public class PlayerProfile {
uniquePlayerData.put(UniqueDataType.CHIMAERA_WING_DATS, 0); //Chimaera wing uniquePlayerData.put(UniqueDataType.CHIMAERA_WING_DATS, 0); //Chimaera wing
} }
@Deprecated
public PlayerProfile(mcMMO pluginRef, String playerName, boolean isLoaded) {
this(pluginRef, playerName);
this.loaded = isLoaded;
}
public PlayerProfile(mcMMO pluginRef, String playerName, UUID uuid, boolean isLoaded) { public PlayerProfile(mcMMO pluginRef, String playerName, UUID uuid, boolean isLoaded) {
this(pluginRef, playerName, uuid); this(pluginRef, playerName, uuid);
this.loaded = isLoaded; this.loaded = isLoaded;

2
mcmmo-core/src/main/java/com/gmail/nossr50/util/commands/CommandTools.java
View File

@@ -75,7 +75,7 @@ public final class CommandTools {
return true; return true;
} }
PlayerProfile profile = new PlayerProfile(pluginRef, playerName, false); PlayerProfile profile = new PlayerProfile(pluginRef, playerName, null, false);
if (unloadedProfile(sender, profile)) { if (unloadedProfile(sender, profile)) {
return false; return false;