From aff4f7965374820ab32502e784d7c80ec865d061 Mon Sep 17 00:00:00 2001 From: OptimShi Date: Mon, 8 Apr 2024 21:00:01 -0700 Subject: [PATCH 01/10] Foward Player object to Activation Target in Activate Emotes (#4147) --- Source/ACE.Server/WorldObjects/Managers/EmoteManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ACE.Server/WorldObjects/Managers/EmoteManager.cs b/Source/ACE.Server/WorldObjects/Managers/EmoteManager.cs index b4e0f82ccc..f0e91f798c 100644 --- 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 { From 6ca63be694fcb6b6c065b5c7da931ecc2294947d Mon Sep 17 00:00:00 2001 From: OptimShi Date: Mon, 8 Apr 2024 21:00:10 -0700 Subject: [PATCH 02/10] Display error message of POI does not exist in /telepoi admin command (#4148) --- Source/ACE.Server/Command/Handlers/AdminCommands.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/ACE.Server/Command/Handlers/AdminCommands.cs b/Source/ACE.Server/Command/Handlers/AdminCommands.cs index 00d741e107..6a5b579f00 100644 --- 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); From 3aab387a69bc523256ffcb0962141f29f06adab0 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Tue, 9 Apr 2024 04:05:49 +0000 Subject: [PATCH 03/10] [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.59.4520.20240409040119-master-6ca63be --- Source/ACE.Server/ServerBuildInfo_Dynamic.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/ACE.Server/ServerBuildInfo_Dynamic.cs b/Source/ACE.Server/ServerBuildInfo_Dynamic.cs index 3b4fa7a5dc..98576d3b18 100644 --- 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 = "6ca63be694fcb6b6c065b5c7da931ecc2294947d"; public static string Version = "1.59"; - public static string Build = "4518"; + public static string Build = "4520"; 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 = 09; + public static int BuildHour = 04; + public static int BuildMinute = 01; + public static int BuildSecond = 19; } } From 90c7e9252cdd28249efac6a98641087483e0cb5e Mon Sep 17 00:00:00 2001 From: OptimShi Date: Sun, 21 Apr 2024 11:23:59 -0700 Subject: [PATCH 04/10] Fix layering issues with armor/clothing (#4149) --- Source/ACE.Server/WorldObjects/Creature_Networking.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ACE.Server/WorldObjects/Creature_Networking.cs b/Source/ACE.Server/WorldObjects/Creature_Networking.cs index 50ddf1aa2d..6dc93122d0 100644 --- 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(); From e7fbdab3f111dd485d98b8a32dbe1983d328cc77 Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 21 Apr 2024 14:24:07 -0400 Subject: [PATCH 05/10] Update DeveloperCommands.cs (#4152) --- Source/ACE.Server/Command/Handlers/DeveloperCommands.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/ACE.Server/Command/Handlers/DeveloperCommands.cs b/Source/ACE.Server/Command/Handlers/DeveloperCommands.cs index 83602e7c12..c4e681f7e6 100644 --- 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")] From 43f0365fc7faaae5bce907b794bc357229e344d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 21 Apr 2024 18:24:36 +0000 Subject: [PATCH 06/10] Bump MSTest.TestFramework from 3.2.2 to 3.3.1 in /Source (#4145) --- Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj | 2 +- Source/ACE.Database.Tests/ACE.Database.Tests.csproj | 2 +- Source/ACE.Server.Tests/ACE.Server.Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj b/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj index a8205c1d87..d12adc3aec 100644 --- a/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj +++ b/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj @@ -29,7 +29,7 @@ - + diff --git a/Source/ACE.Database.Tests/ACE.Database.Tests.csproj b/Source/ACE.Database.Tests/ACE.Database.Tests.csproj index 2a2a1b1d43..3c70535ca1 100644 --- a/Source/ACE.Database.Tests/ACE.Database.Tests.csproj +++ b/Source/ACE.Database.Tests/ACE.Database.Tests.csproj @@ -30,7 +30,7 @@ - + diff --git a/Source/ACE.Server.Tests/ACE.Server.Tests.csproj b/Source/ACE.Server.Tests/ACE.Server.Tests.csproj index 3a736d1662..b4dd2f8ac6 100644 --- a/Source/ACE.Server.Tests/ACE.Server.Tests.csproj +++ b/Source/ACE.Server.Tests/ACE.Server.Tests.csproj @@ -30,7 +30,7 @@ - + From e3e763804ac3ad3bb722ba5596fd8deb1fee6543 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 21 Apr 2024 18:25:02 +0000 Subject: [PATCH 07/10] Bump Microsoft.EntityFrameworkCore from 6.0.28 to 6.0.29 in /Source (#4150) --- Source/ACE.Database/ACE.Database.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ACE.Database/ACE.Database.csproj b/Source/ACE.Database/ACE.Database.csproj index ebb6262d02..c6d618168c 100644 --- a/Source/ACE.Database/ACE.Database.csproj +++ b/Source/ACE.Database/ACE.Database.csproj @@ -18,7 +18,7 @@ - + From e4718d157a50b6a221cea3b8ccb29b219c94a8fd Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 21 Apr 2024 18:31:56 +0000 Subject: [PATCH 08/10] [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.59.4525.20240421182611-master-e3e7638 --- Source/ACE.Server/ServerBuildInfo_Dynamic.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/ACE.Server/ServerBuildInfo_Dynamic.cs b/Source/ACE.Server/ServerBuildInfo_Dynamic.cs index 98576d3b18..ae88f0ca84 100644 --- 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 = "6ca63be694fcb6b6c065b5c7da931ecc2294947d"; + public static string Commit = "e3e763804ac3ad3bb722ba5596fd8deb1fee6543"; public static string Version = "1.59"; - public static string Build = "4520"; + public static string Build = "4525"; public static int BuildYear = 2024; public static int BuildMonth = 04; - public static int BuildDay = 09; - public static int BuildHour = 04; - public static int BuildMinute = 01; - public static int BuildSecond = 19; + public static int BuildDay = 21; + public static int BuildHour = 18; + public static int BuildMinute = 26; + public static int BuildSecond = 11; } } From 07c7e893d63fb6e4237a0fc9c596a0b2aa53588a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 21 Apr 2024 18:39:19 +0000 Subject: [PATCH 09/10] Bump MSTest.TestAdapter from 3.2.2 to 3.3.1 in /Source (#4146) --- Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj | 2 +- Source/ACE.Database.Tests/ACE.Database.Tests.csproj | 2 +- Source/ACE.Server.Tests/ACE.Server.Tests.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj b/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj index d12adc3aec..6cfdb0600a 100644 --- a/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj +++ b/Source/ACE.DatLoader.Tests/ACE.DatLoader.Tests.csproj @@ -28,7 +28,7 @@ - + diff --git a/Source/ACE.Database.Tests/ACE.Database.Tests.csproj b/Source/ACE.Database.Tests/ACE.Database.Tests.csproj index 3c70535ca1..03cb78499f 100644 --- a/Source/ACE.Database.Tests/ACE.Database.Tests.csproj +++ b/Source/ACE.Database.Tests/ACE.Database.Tests.csproj @@ -29,7 +29,7 @@ - + diff --git a/Source/ACE.Server.Tests/ACE.Server.Tests.csproj b/Source/ACE.Server.Tests/ACE.Server.Tests.csproj index b4dd2f8ac6..aaf44c4bee 100644 --- a/Source/ACE.Server.Tests/ACE.Server.Tests.csproj +++ b/Source/ACE.Server.Tests/ACE.Server.Tests.csproj @@ -29,7 +29,7 @@ - + From c36f88e7595b09c84aed510acdba22f54feb269a Mon Sep 17 00:00:00 2001 From: Ty Conner Date: Sun, 21 Apr 2024 18:46:14 +0000 Subject: [PATCH 10/10] [ci skip] Updating ServerBuildInfo_Dynamic.cs 1.59.4526.20240421184034-master-07c7e89 --- Source/ACE.Server/ServerBuildInfo_Dynamic.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/ACE.Server/ServerBuildInfo_Dynamic.cs b/Source/ACE.Server/ServerBuildInfo_Dynamic.cs index ae88f0ca84..3d9b62ea38 100644 --- 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 = "e3e763804ac3ad3bb722ba5596fd8deb1fee6543"; + public static string Commit = "07c7e893d63fb6e4237a0fc9c596a0b2aa53588a"; public static string Version = "1.59"; - public static string Build = "4525"; + public static string Build = "4526"; public static int BuildYear = 2024; public static int BuildMonth = 04; public static int BuildDay = 21; public static int BuildHour = 18; - public static int BuildMinute = 26; - public static int BuildSecond = 11; + public static int BuildMinute = 40; + public static int BuildSecond = 34; } }