Merge branch 'ACEmulator:master' into YonnehTown

Yonneh0 · Feb 17, 2025 · e0bfd41 · e0bfd41
2 parents d6b1534 + 448956d
commit e0bfd41
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj b/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj
@@ -28,8 +28,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.7.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.7.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.7.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.7.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/ACE.DatLoader/DatReader.cs b/Source/ACE.DatLoader/DatReader.cs
@@ -35,7 +35,7 @@ private static byte[] ReadDat(FileStream stream, uint offset, uint size, uint bl
 
             while (size > 0)
             {
-                if (size < blockSize)
+                if (nextAddress == 0)
                 {
                     stream.Read(buffer, bufferOffset, Convert.ToInt32(size));
                     size = 0; // We know we've read the only/last sector, so just set this to zero to proceed.

diff --git a/Source/ACE.Database.Tests/ACE.Database.Tests.csproj b/Source/ACE.Database.Tests/ACE.Database.Tests.csproj
@@ -29,8 +29,8 @@
   <ItemGroup>
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.7.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.7.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.7.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.7.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/ACE.Server.Tests/ACE.Server.Tests.csproj b/Source/ACE.Server.Tests/ACE.Server.Tests.csproj
@@ -29,8 +29,8 @@
   <ItemGroup>
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.7.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.7.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.7.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.7.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/ACE.Server/ServerBuildInfo_Dynamic.cs b/Source/ACE.Server/ServerBuildInfo_Dynamic.cs
@@ -4,17 +4,17 @@ namespace ACE.Server
     public static partial class ServerBuildInfo 
     { 
         public static string Branch = "master"; 
-        public static string Commit = "3f255c321e3dcc66b79af5565c87e2ee818934af"; 
+        public static string Commit = "d05d87acffbce6c80366114009e1fcb1def73cf2"; 
 
         public static string Version = "1.66"; 
-        public static string Build   = "4630"; 
+        public static string Build   = "4633"; 
 
         public static int BuildYear   = 2025; 
-        public static int BuildMonth  = 01; 
-        public static int BuildDay    = 15; 
-        public static int BuildHour   = 02; 
-        public static int BuildMinute = 11; 
-        public static int BuildSecond = 03; 
+        public static int BuildMonth  = 02; 
+        public static int BuildDay    = 01; 
+        public static int BuildHour   = 21; 
+        public static int BuildMinute = 58; 
+        public static int BuildSecond = 56; 
     } 
 }