Skip to content

Commit

Permalink
Fix MpqFile.MpqStream.BaseStream disposed exception when creating the…
Browse files Browse the repository at this point in the history 
… MpqFile through MapExtensions.
  • Loading branch information
@Drake53
Drake53 committed Apr 25, 2022
1 parent a795080 commit 73cfc61
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions src/War3Net.Build.Core/Extensions/MapExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.Sounds);
Expand All @@ -46,7 +46,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.Cameras);
Expand All @@ -62,7 +62,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.Environment);
Expand All @@ -78,7 +78,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.PathingMap);
Expand All @@ -94,7 +94,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.PreviewIcons);
Expand All @@ -110,7 +110,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.Regions);
Expand All @@ -126,7 +126,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.ShadowMap);
Expand All @@ -142,7 +142,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.ImportedFiles);
Expand All @@ -158,7 +158,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.Info);
Expand All @@ -174,7 +174,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.AbilityObjectData);
Expand All @@ -190,7 +190,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.BuffObjectData);
Expand All @@ -206,7 +206,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.DestructableObjectData);
Expand All @@ -222,7 +222,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.DoodadObjectData);
Expand All @@ -238,7 +238,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.ItemObjectData);
Expand All @@ -254,7 +254,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.UnitObjectData);
Expand All @@ -270,7 +270,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.UpgradeObjectData);
Expand All @@ -286,7 +286,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.CustomTextTriggers, encoding ?? _defaultEncoding);
Expand All @@ -302,7 +302,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new StreamWriter(memoryStream, encoding ?? _defaultEncoding, leaveOpen: true);

writer.Write(map.Script);
Expand All @@ -318,7 +318,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.Triggers);
Expand All @@ -334,7 +334,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new StreamWriter(memoryStream, encoding ?? _defaultEncoding, leaveOpen: true);

writer.WriteTriggerStrings(map.TriggerStrings);
Expand All @@ -350,7 +350,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.Doodads);
Expand All @@ -366,7 +366,7 @@ public static class MapExtensions
return null;
}

using var memoryStream = new MemoryStream();
var memoryStream = new MemoryStream();
using var writer = new BinaryWriter(memoryStream, encoding ?? _defaultEncoding, true);

writer.Write(map.Units);
Expand Down

0 comments on commit 73cfc61

Please sign in to comment.