Skip to content

Commit ba6f881

Browse files
committed
Update v2.3.4.17
2 parents c5707ff + 3471d8f commit ba6f881

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

xivModdingFramework/Models/Helpers/ModelModifiers.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,14 @@ public void Apply(TTModel ttModel, XivMdl currentMdl = null, XivMdl originalMdl
133133
throw new Exception("Cannot copy settings from null MDL.");
134134
}
135135
ModelModifiers.ClearShapeData(ttModel, loggingFunction);
136-
ModelModifiers.MergeShapeData(ttModel, originalMdl, loggingFunction);
136+
try
137+
{
138+
ModelModifiers.MergeShapeData(ttModel, originalMdl, loggingFunction);
139+
}
140+
catch
141+
{
142+
throw new Exception("Failed to apply the original shape data.\nThis is likely due to changes to the original model without preserving the vertices' order.");
143+
}
137144
}
138145

139146
if (AutoScale)

xivModdingFramework/Mods/FileTypes/TTMP.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ public async Task<int> CreateWizardModPack(ModPackData modPackData, IProgress<do
192192
var zf = new ZipFile();
193193
zf.UseZip64WhenSaving = Zip64Option.AsNecessary;
194194
zf.CompressionLevel = Ionic.Zlib.CompressionLevel.None;
195-
zf.UseZip64WhenSaving = Zip64Option.AsNecessary;
196195
zf.AddFile(_tempMPL, "");
197196
zf.AddFile(_tempMPD, "");
198197
zf.Save(modPackPath);
@@ -319,7 +318,6 @@ public async Task<int> CreateSimpleModPack(SimpleModPackData modPackData, Direct
319318
var zf = new ZipFile();
320319
zf.UseZip64WhenSaving = Zip64Option.AsNecessary;
321320
zf.CompressionLevel = Ionic.Zlib.CompressionLevel.None;
322-
zf.UseZip64WhenSaving = Zip64Option.AsNecessary;
323321
zf.AddFile(_tempMPL, "");
324322
zf.AddFile(_tempMPD, "");
325323
zf.Save(modPackPath);

0 commit comments

Comments
 (0)