Merge branch 'ACEmulator:master' into metrics

ACEmulator · Sep 30, 2024 · e8efbe8 · e8efbe8
2 parents a864927 + 73b382b
commit e8efbe8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/Source/ACE.DatLoader/ACE.DatLoader.csproj b/Source/ACE.DatLoader/ACE.DatLoader.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.17" />
+    <PackageReference Include="log4net" Version="3.0.0" />
     <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
   </ItemGroup>

diff --git a/Source/ACE.Database/ACE.Database.csproj b/Source/ACE.Database/ACE.Database.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.17" />
+    <PackageReference Include="log4net" Version="3.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
   </ItemGroup>

diff --git a/Source/ACE.Server/ACE.Server.csproj b/Source/ACE.Server/ACE.Server.csproj
@@ -235,7 +235,7 @@
 
   <ItemGroup>
     <PackageReference Include="Lib.Harmony" Version="2.3.3" />
-    <PackageReference Include="log4net" Version="2.0.17" />
+    <PackageReference Include="log4net" Version="3.0.0" />
     <PackageReference Include="Log4Net.Async.Standard" Version="3.1.0" />
     <PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0" />
     <PackageReference Include="MySqlConnector" Version="2.3.7" />

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 = "ff486e1c8082b9a67ac094db57a32ef25699baba"; 
+        public static string Commit = "836837bf3c846f6a58ffb2dda9dfc40aa42f8dc1"; 
 
         public static string Version = "1.63"; 
-        public static string Build   = "4603"; 
+        public static string Build   = "4605"; 
 
         public static int BuildYear   = 2024; 
         public static int BuildMonth  = 09; 
-        public static int BuildDay    = 22; 
-        public static int BuildHour   = 05; 
-        public static int BuildMinute = 30; 
-        public static int BuildSecond = 41; 
+        public static int BuildDay    = 30; 
+        public static int BuildHour   = 02; 
+        public static int BuildMinute = 21; 
+        public static int BuildSecond = 32; 
     } 
 } 
 
diff --git a/Source/ACE.Server/WorldObjects/WorldObject_Magic.cs b/Source/ACE.Server/WorldObjects/WorldObject_Magic.cs
@@ -922,9 +922,14 @@ private void HandleCastSpell_Projectile(Spell spell, WorldObject target, WorldOb
                     //if (player != null && player.Fellowship != null)
                     //player.Fellowship.OnVitalUpdate(player);
                 }
+                else if(spell.DamageType != DamageType.Undef)
+                {
+                    // Handle rare case where some of these "Life Magic" spells do physical damage e.g. Hunter's Lash 2970 and Thorn Valley 6159
+                    damageType = spell.DamageType;
+                }
                 else
                 {
-                    log.Warn($"Unknown DamageType for LifeProjectile {spell.Name} - {spell.Id}");
+                    log.Warn($"Unknown DamageType ({spell.DamageType}) for LifeProjectile {spell.Name} - {spell.Id}");
                     return;
                 }
             }