Merge branch 'master' into net8

ACEmulator · Apr 21, 2024 · 6a0937e · 6a0937e
2 parents b51138d + c36f88e
commit 6a0937e
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 15 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.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
   </ItemGroup>
 
   <ItemGroup>

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.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/ACE.Database/ACE.Database.csproj b/Source/ACE.Database/ACE.Database.csproj
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.17" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.28" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.29" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.3" />
   </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.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/ACE.Server/Command/Handlers/AdminCommands.cs b/Source/ACE.Server/Command/Handlers/AdminCommands.cs
@@ -893,7 +893,10 @@ public static void HandleTeleportPoi(Session session, params string[] parameters
             {
                 var teleportPOI = DatabaseManager.World.GetCachedPointOfInterest(poi);
                 if (teleportPOI == null)
+                {
+                    session.Network.EnqueueSend(new GameMessageSystemChat($"Location: \"{poi}\" not found. Use \"list\" to display all valid locations.", ChatMessageType.Broadcast));
                     return;
+                }
                 var weenie = DatabaseManager.World.GetCachedWeenie(teleportPOI.WeenieClassId);
                 var portalDest = new Position(weenie.GetPosition(PositionType.Destination));
                 WorldObject.AdjustDungeon(portalDest);

diff --git a/Source/ACE.Server/Command/Handlers/DeveloperCommands.cs b/Source/ACE.Server/Command/Handlers/DeveloperCommands.cs
@@ -2214,6 +2214,8 @@ public static void HandleClearPhysicsCaches(Session session, params string[] par
         public static void HandleForceGC(Session session, params string[] parameters)
         {
             GC.Collect();
+
+            CommandHandlerHelper.WriteOutputInfo(session, ".NET Garbage Collection forced");
         }
 
         [CommandHandler("forcegc2", AccessLevel.Developer, CommandHandlerFlag.None, 0, "Forces .NET Garbage Collection with LOH Compact")]

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 = "918aa66d9b05576b341a5f0235a885eccd7e2bfd"; 
+        public static string Commit = "07c7e893d63fb6e4237a0fc9c596a0b2aa53588a"; 
 
         public static string Version = "1.59"; 
-        public static string Build   = "4518"; 
+        public static string Build   = "4526"; 
 
         public static int BuildYear   = 2024; 
         public static int BuildMonth  = 04; 
-        public static int BuildDay    = 05; 
-        public static int BuildHour   = 17; 
-        public static int BuildMinute = 04; 
-        public static int BuildSecond = 55; 
+        public static int BuildDay    = 21; 
+        public static int BuildHour   = 18; 
+        public static int BuildMinute = 40; 
+        public static int BuildSecond = 34; 
     } 
 } 
 
diff --git a/Source/ACE.Server/WorldObjects/Creature_Networking.cs b/Source/ACE.Server/WorldObjects/Creature_Networking.cs
@@ -121,7 +121,7 @@ public override ACE.Entity.ObjDesc CalculateObjDesc()
             var sortedArmorItems = bottom.Concat(noLayer).Concat(top).ToList();
 
             var clothesAndCloaks = EquippedObjects.Values
-                                .Where(x => (x.ItemType == ItemType.Clothing)) // FootWear & HandWear is included in the ArmorItems above
+                                .Where(x => (x.ItemType == ItemType.Clothing) && (x.CurrentWieldedLocation & (EquipMask.Armor | EquipMask.Extremity)) == 0) // Extremity, Head/Foot/Hands, is included in the ArmorItems above
                                 .OrderBy(x => x.ClothingPriority);
 
             var eo = clothesAndCloaks.Concat(sortedArmorItems).ToList();

diff --git a/Source/ACE.Server/WorldObjects/Managers/EmoteManager.cs b/Source/ACE.Server/WorldObjects/Managers/EmoteManager.cs
@@ -84,7 +84,7 @@ public float ExecuteEmote(PropertiesEmote emoteSet, PropertiesEmoteAction emote,
                     {
                         // ActOnUse delay?
                         var activationTarget = WorldObject.CurrentLandblock?.GetObject(WorldObject.ActivationTarget);
-                        activationTarget?.OnActivate(WorldObject);
+                        activationTarget?.OnActivate(player ?? WorldObject);
                     }
                     else if (WorldObject.GeneratorId.HasValue && WorldObject.GeneratorId > 0) // Fallback to linked generator
                     {