AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-22 12:05:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix copying a level not saving to disc first.

Browse Source 
You used to potentially lose a few recent changes in the copied map if the source level hadn't been saved for a while
This commit is contained in:
UnknownShadow200 2020-01-20 07:49:51 +11:00
parent 57a85ed71d
commit 4dcca3ff0a
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MCGalaxy/Commands/World/CmdCopyLVL.cs
View File

@ -44,10 +44,9 @@ namespace MCGalaxy.Commands.World {
string dst = args[1]; string dst = args[1];
if (!Formatter.ValidMapName(p, dst)) return; if (!Formatter.ValidMapName(p, dst)) return;
if (LevelInfo.MapExists(dst)) { p.Message("Level \"" + dst + "\" already exists."); return; }
try { try {
LevelActions.CopyLevel(src, dst); if (!LevelActions.CopyLevel(p, src, dst)) return;
} catch (IOException) { } catch (IOException) {
p.Message("Level %W" + dst + " %Salready exists!"); return; p.Message("Level %W" + dst + " %Salready exists!"); return;
} }

19
MCGalaxy/Levels/LevelActions.cs
View File

@ -173,18 +173,31 @@ namespace MCGalaxy {
Server.mainLevel = lvl; Server.mainLevel = lvl;
} }
public static void CopyLevel(string src, string dst) { /// <summary> Copies a map and related metadata. </summary>
/// <remarks> Backups and BlockDB are NOT copied. </remarks>
public static bool CopyLevel(Player p, string src, string dst) {
if (LevelInfo.MapExists(dst)) {
p.Message("%WLevel \"{0}\" already exists.", dst); return false;
}
// Make sure any changes to live map are saved first
Level lvl = LevelInfo.FindExact(src);
if (lvl != null && !lvl.Save(true)) {
p.Message("%WUnable to save {0}! Some recent block changes may not be copied.", src);
}
File.Copy(LevelInfo.MapPath(src), LevelInfo.MapPath(dst)); File.Copy(LevelInfo.MapPath(src), LevelInfo.MapPath(dst));
DoAll(src, dst, action_copy); DoAll(src, dst, action_copy);
CopyDatabaseTables(src, dst); CopyDatabaseTables(src, dst);
return true;
} }
static void CopyDatabaseTables(string src, string dst) { static void CopyDatabaseTables(string src, string dst) {
object srcLocker = ThreadSafeCache.DBCache.GetLocker(src); object srcLocker = ThreadSafeCache.DBCache.GetLocker(src);
object dstLockder = ThreadSafeCache.DBCache.GetLocker(dst); object dstLocker = ThreadSafeCache.DBCache.GetLocker(dst);
lock (srcLocker) lock (srcLocker)
lock (dstLockder) lock (dstLocker)
{ {
if (Database.TableExists("Portals" + src)) { if (Database.TableExists("Portals" + src)) {
Database.Backend.CreateTable("Portals" + dst, LevelDB.createPortals); Database.Backend.CreateTable("Portals" + dst, LevelDB.createPortals);