Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,15 @@ private static PlayerData create(ServerPlayer player, File playerDataFile) {
public static PlayerData create(NamedLocationStorage homes, File saveFile) {
String fileName = saveFile.getName();
UUID playerUuid = UUID.fromString(fileName.substring(0, fileName.indexOf(".dat")));

if (PlayerDataManager.exists()) {
PlayerData activePlayerData = PlayerDataManager.getInstance().getByUuid(playerUuid);
if (activePlayerData != null) {
activePlayerData.homes.putAll(homes);
activePlayerData.setDirty();
return activePlayerData;
}
}
PlayerData playerData = null;
if (Files.exists(saveFile.toPath()) && saveFile.length() != 0) {
try {
Expand Down Expand Up @@ -98,6 +107,7 @@ public static PlayerData create(NamedLocationStorage homes, File saveFile) {

if (playerData == null) {
playerData = new PlayerData(saveFile);
playerData.homes.putAll(homes);
}

playerData.setDirty();
Expand Down