From c74b6720e9fd22164b5c1ddd0852d402be378cfd Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 20 May 2017 14:57:36 -0700 Subject: [PATCH] Renamed Player to APlayer to avoid conflict with bukkit Player class. --- .../tastybento/bskyblock/database/ASBDatabase.java | 6 +++--- .../bskyblock/database/PlayersManager.java | 12 ++++++------ .../database/flatfile/FlatFileDatabase.java | 6 +++--- .../bskyblock/database/mysql/MySQLDatabase.java | 6 +++--- .../database/objects/{Player.java => APlayer.java} | 4 ++-- .../bskyblock/database/sqlite/SQLiteDatabase.java | 6 +++--- 6 files changed, 20 insertions(+), 20 deletions(-) rename src/main/java/us/tastybento/bskyblock/database/objects/{Player.java => APlayer.java} (98%) diff --git a/src/main/java/us/tastybento/bskyblock/database/ASBDatabase.java b/src/main/java/us/tastybento/bskyblock/database/ASBDatabase.java index 298e478ab..fef81d501 100755 --- a/src/main/java/us/tastybento/bskyblock/database/ASBDatabase.java +++ b/src/main/java/us/tastybento/bskyblock/database/ASBDatabase.java @@ -8,7 +8,7 @@ import us.tastybento.bskyblock.config.Settings; import us.tastybento.bskyblock.database.flatfile.FlatFileDatabase; import us.tastybento.bskyblock.database.mysql.MySQLDatabase; import us.tastybento.bskyblock.database.objects.Island; -import us.tastybento.bskyblock.database.objects.Player; +import us.tastybento.bskyblock.database.objects.APlayer; import us.tastybento.bskyblock.database.sqlite.SQLiteDatabase; public abstract class ASBDatabase { @@ -20,8 +20,8 @@ public abstract class ASBDatabase { return DatabaseType.FLATFILE.database; } - public abstract Player loadPlayerData(UUID uuid); - public abstract void savePlayerData(Player player); + public abstract APlayer loadPlayerData(UUID uuid); + public abstract void savePlayerData(APlayer player); public abstract Island loadIslandData(String location); public abstract void saveIslandData(Island island); diff --git a/src/main/java/us/tastybento/bskyblock/database/PlayersManager.java b/src/main/java/us/tastybento/bskyblock/database/PlayersManager.java index 7d47ecf54..8969f4528 100755 --- a/src/main/java/us/tastybento/bskyblock/database/PlayersManager.java +++ b/src/main/java/us/tastybento/bskyblock/database/PlayersManager.java @@ -5,19 +5,19 @@ import java.util.Map.Entry; import java.util.UUID; import us.tastybento.bskyblock.BSkyBlock; -import us.tastybento.bskyblock.database.objects.Player; +import us.tastybento.bskyblock.database.objects.APlayer; public class PlayersManager{ private BSkyBlock plugin; private ASBDatabase database; - private HashMap players; + private HashMap players; public PlayersManager(BSkyBlock plugin){ this.plugin = plugin; database = ASBDatabase.getDatabase(); - players = new HashMap(); + players = new HashMap(); } public void load(){ @@ -30,13 +30,13 @@ public class PlayersManager{ @Override public void run() { - for(Entry entry : players.entrySet()){ + for(Entry entry : players.entrySet()){ database.savePlayerData(entry.getValue()); } } }); } else { - for(Entry entry : players.entrySet()){ + for(Entry entry : players.entrySet()){ database.savePlayerData(entry.getValue()); } } @@ -47,7 +47,7 @@ public class PlayersManager{ players.clear(); } - public Player getPlayer(UUID uuid){ + public APlayer getPlayer(UUID uuid){ return players.get(uuid); } } diff --git a/src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabase.java b/src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabase.java index ae527ab94..2733bace2 100755 --- a/src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabase.java +++ b/src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabase.java @@ -6,18 +6,18 @@ import java.util.UUID; import us.tastybento.bskyblock.database.ASBDatabase; import us.tastybento.bskyblock.database.objects.Island; -import us.tastybento.bskyblock.database.objects.Player; +import us.tastybento.bskyblock.database.objects.APlayer; public class FlatFileDatabase extends ASBDatabase{ @Override - public Player loadPlayerData(UUID uuid) { + public APlayer loadPlayerData(UUID uuid) { // TODO Auto-generated method stub return null; } @Override - public void savePlayerData(Player player) { + public void savePlayerData(APlayer player) { // TODO Auto-generated method stub } diff --git a/src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabase.java b/src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabase.java index be945f04b..c09177ef3 100755 --- a/src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabase.java +++ b/src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabase.java @@ -6,18 +6,18 @@ import java.util.UUID; import us.tastybento.bskyblock.database.ASBDatabase; import us.tastybento.bskyblock.database.objects.Island; -import us.tastybento.bskyblock.database.objects.Player; +import us.tastybento.bskyblock.database.objects.APlayer; public class MySQLDatabase extends ASBDatabase{ @Override - public Player loadPlayerData(UUID uuid) { + public APlayer loadPlayerData(UUID uuid) { // TODO Auto-generated method stub return null; } @Override - public void savePlayerData(Player player) { + public void savePlayerData(APlayer player) { // TODO Auto-generated method stub } diff --git a/src/main/java/us/tastybento/bskyblock/database/objects/Player.java b/src/main/java/us/tastybento/bskyblock/database/objects/APlayer.java similarity index 98% rename from src/main/java/us/tastybento/bskyblock/database/objects/Player.java rename to src/main/java/us/tastybento/bskyblock/database/objects/APlayer.java index 8c304de84..74dbf5341 100755 --- a/src/main/java/us/tastybento/bskyblock/database/objects/Player.java +++ b/src/main/java/us/tastybento/bskyblock/database/objects/APlayer.java @@ -13,7 +13,7 @@ import us.tastybento.bskyblock.config.Settings; * @author Tastybento * @author Poslovitch */ -public class Player { +public class APlayer { private UUID uuid; private String locale; @@ -27,7 +27,7 @@ public class Player { * Constructor - initializes the variables * @param uuid - UUID of the player */ - public Player(UUID uuid){ + public APlayer(UUID uuid){ this.uuid = uuid; this.locale = ""; diff --git a/src/main/java/us/tastybento/bskyblock/database/sqlite/SQLiteDatabase.java b/src/main/java/us/tastybento/bskyblock/database/sqlite/SQLiteDatabase.java index 783a38519..e7fe58fe0 100755 --- a/src/main/java/us/tastybento/bskyblock/database/sqlite/SQLiteDatabase.java +++ b/src/main/java/us/tastybento/bskyblock/database/sqlite/SQLiteDatabase.java @@ -6,18 +6,18 @@ import java.util.UUID; import us.tastybento.bskyblock.database.ASBDatabase; import us.tastybento.bskyblock.database.objects.Island; -import us.tastybento.bskyblock.database.objects.Player; +import us.tastybento.bskyblock.database.objects.APlayer; public class SQLiteDatabase extends ASBDatabase{ @Override - public Player loadPlayerData(UUID uuid) { + public APlayer loadPlayerData(UUID uuid) { // TODO Auto-generated method stub return null; } @Override - public void savePlayerData(Player player) { + public void savePlayerData(APlayer player) { // TODO Auto-generated method stub }