Fix personal dorm blob recovery

This commit is contained in:
Alexa
2026-06-15 00:02:48 +03:00
parent 243a61ada1
commit a249a50952
4 changed files with 204 additions and 52 deletions
@@ -1166,16 +1166,15 @@ public class GoToController(
if (isDorm && dormOwnerId is long ownerId)
{
var dormBlob = await db.DormStates.AsNoTracking()
.Where(d => d.PlayerId == ownerId)
.Select(d => d.CurrentDataBlobName)
.FirstOrDefaultAsync();
var dormBlob = await rooms.ResolveDormDataBlobNameAsync(ownerId, room.Id);
if (!string.IsNullOrWhiteSpace(dormBlob)) return dormBlob;
}
if (!string.IsNullOrWhiteSpace(room.CurrentDataBlobName)) return room.CurrentDataBlobName;
var customisable = room.IsDormRoom || room.CreatorPlayerId != 1;
if (room.IsDormRoom) return string.Empty;
var customisable = room.CreatorPlayerId != 1;
return customisable ? $"room_{room.Id}_v1.dat" : string.Empty;
}
@@ -397,10 +397,7 @@ public class MatchPlayerController(
if (room.IsDormRoom)
{
var dormBlob = await db.DormStates.AsNoTracking()
.Where(d => d.PlayerId == playerId)
.Select(d => d.CurrentDataBlobName)
.FirstOrDefaultAsync();
var dormBlob = await rooms.ResolveDormDataBlobNameAsync(playerId, room.Id);
if (!string.IsNullOrWhiteSpace(dormBlob)) return dormBlob;
}
@@ -415,7 +412,9 @@ public class MatchPlayerController(
if (!string.IsNullOrWhiteSpace(room.CurrentDataBlobName)) return room.CurrentDataBlobName;
var customisable = room.IsDormRoom || room.CreatorPlayerId != 1;
if (room.IsDormRoom) return string.Empty;
var customisable = room.CreatorPlayerId != 1;
return customisable ? $"room_{room.Id}_v1.dat" : string.Empty;
}
}