Update 2.3.1.3

Author: Lunaretic

xivModdingFramework/Mods/RootCloner.cs

@@ -74,6 +74,8 @@ public static async Task CloneRoot(XivDependencyRoot Source, XivDependencyRoot D
                     foreach (var avfx in avfxSets)
                     {
                         var avfxStuff = await ATex.GetVfxPath(Source.Info, avfx);
+                        if (String.IsNullOrEmpty(avfxStuff.Folder) || String.IsNullOrEmpty(avfxStuff.File)) continue;
+
                         var path = avfxStuff.Folder + "/" + avfxStuff.File;
                         if (await _index.FileExists(path))
                         {
@@ -159,21 +161,24 @@ public static async Task CloneRoot(XivDependencyRoot Source, XivDependencyRoot D
                     ProgressReporter.Report("Removing existing modifications to destination root...");
                 }
 
-                var dPath = Destination.Info.GetRootFolder();
-                foreach (var mod in modlist.Mods)
+                if (Destination != Source)
                 {
-                    if (mod.fullPath.StartsWith(dPath) && !mod.IsInternal())
+                    var dPath = Destination.Info.GetRootFolder();
+                    foreach (var mod in modlist.Mods)
                     {
-                        if (Destination.Info.SecondaryType != null || Destination.Info.Slot == null)
+                        if (mod.fullPath.StartsWith(dPath) && !mod.IsInternal())
                         {
-                            // If this is a slotless root, purge everything.
-                            await _modding.DeleteMod(mod.fullPath, false);
-                        }
-                        else if(allFiles.Contains(mod.fullPath) || mod.fullPath.Contains(Destination.Info.Slot))
-                        {
-                            // Otherwise, only purge the files we're replacing, and anything else that
-                            // contains our slot name.
-                            await _modding.DeleteMod(mod.fullPath, false);
+                            if (Destination.Info.SecondaryType != null || Destination.Info.Slot == null)
+                            {
+                                // If this is a slotless root, purge everything.
+                                await _modding.DeleteMod(mod.fullPath, false);
+                            }
+                            else if (allFiles.Contains(mod.fullPath) || mod.fullPath.Contains(Destination.Info.Slot))
+                            {
+                                // Otherwise, only purge the files we're replacing, and anything else that
+                                // contains our slot name.
+                                await _modding.DeleteMod(mod.fullPath, false);
+                            }
                         }
                     }
                 }
@@ -190,6 +195,10 @@ public static async Task CloneRoot(XivDependencyRoot Source, XivDependencyRoot D
                     var dst = kv.Value;
                     var xmdl = await _mdl.GetRawMdlData(src);
                     var tmdl = TTModel.FromRaw(xmdl);
+
+                    if (xmdl == null || tmdl == null)
+                        continue;
+
                     tmdl.Source = dst;
                     xmdl.MdlPath = dst;
 

xivModdingFramework/SqPack/FileTypes/Dat.cs

@@ -1450,6 +1450,11 @@ public async Task<long> CopyFile(string sourcePath, string targetPath, string ca
         {
             var _index = new Index(_gameDirectory);
             var offset = await _index.GetDataOffset(sourcePath);
+            if(offset == 0)
+            {
+                return 0;
+            }
+
             var dataFile = IOUtil.GetDataFileFromPath(sourcePath);
             return await CopyFile(offset, dataFile, targetPath, category, itemName, source, overwrite);
         }