From e8a199e498120e86b11d56e541a136b26db8f95b Mon Sep 17 00:00:00 2001 From: Nathan Oines <75092691+Senion31@users.noreply.github.com> Date: Fri, 27 Dec 2024 14:29:28 -0600 Subject: [PATCH 1/7] fix: Allow guildstone movement within the same house (#2031) - Adjusted condition to prevent unnecessary "one guildstone per house" restriction when moving the guildstone inside the same house since the guildstone does not disappear after teleporter generation. Refactors the teleportation logic for improved user experience. --- Projects/UOContent/Items/Guilds/GuildTeleporter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Projects/UOContent/Items/Guilds/GuildTeleporter.cs b/Projects/UOContent/Items/Guilds/GuildTeleporter.cs index 81d7efa12..dc471b0ad 100644 --- a/Projects/UOContent/Items/Guilds/GuildTeleporter.cs +++ b/Projects/UOContent/Items/Guilds/GuildTeleporter.cs @@ -51,7 +51,7 @@ public partial class GuildTeleporter : Item { from.SendLocalizedMessage(501141); // You can only place a guildstone in a house you own! } - else if (house.FindGuildstone() != null) + else if (house.FindGuildstone() != null && house.FindGuildstone() != _stone) { from.SendLocalizedMessage(501142); // Only one guildstone may reside in a given house. } From 60b97f80d8c41b868934d527e403d280212781d7 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Fri, 27 Dec 2024 12:56:41 -0800 Subject: [PATCH 2/7] chore(deps): Bumps xunit to 3.0, serialization generator to 2.12.18, high performance to 8.4, and mailkit to 4.9 (#2032) --- Directory.Build.props | 2 +- Projects/Server.Tests/Server.Tests.csproj | 2 +- Projects/Server/Network/TcpServer.cs | 4 ++-- Projects/Server/Server.csproj | 4 ++-- Projects/UOContent.Tests/UOContent.Tests.csproj | 2 +- Projects/UOContent/Mobiles/PlayerMobile.cs | 4 ---- Projects/UOContent/UOContent.csproj | 6 +++--- 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 738850042..43a8a6044 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -66,7 +66,7 @@ - 3.6.146 + 3.7.112 all diff --git a/Projects/Server.Tests/Server.Tests.csproj b/Projects/Server.Tests/Server.Tests.csproj index 13c30656a..e5d6a179b 100644 --- a/Projects/Server.Tests/Server.Tests.csproj +++ b/Projects/Server.Tests/Server.Tests.csproj @@ -7,7 +7,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Projects/Server/Network/TcpServer.cs b/Projects/Server/Network/TcpServer.cs index be526f703..52a5201c8 100644 --- a/Projects/Server/Network/TcpServer.cs +++ b/Projects/Server/Network/TcpServer.cs @@ -37,8 +37,8 @@ public static class TcpServer public static void Start() { - HashSet listeningAddresses = new HashSet(); - List listeners = new List(); + HashSet listeningAddresses = []; + List listeners = []; foreach (var ipep in ServerConfiguration.Listeners) { var listener = CreateListener(ipep); diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj index 8536a2bb2..123ad7a73 100644 --- a/Projects/Server/Server.csproj +++ b/Projects/Server/Server.csproj @@ -33,13 +33,13 @@ - + - + diff --git a/Projects/UOContent.Tests/UOContent.Tests.csproj b/Projects/UOContent.Tests/UOContent.Tests.csproj index ce902d224..2e3acc315 100644 --- a/Projects/UOContent.Tests/UOContent.Tests.csproj +++ b/Projects/UOContent.Tests/UOContent.Tests.csproj @@ -6,7 +6,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Projects/UOContent/Mobiles/PlayerMobile.cs b/Projects/UOContent/Mobiles/PlayerMobile.cs index da7e427cb..f2ea4fa28 100644 --- a/Projects/UOContent/Mobiles/PlayerMobile.cs +++ b/Projects/UOContent/Mobiles/PlayerMobile.cs @@ -28,13 +28,9 @@ using Server.Regions; using Server.SkillHandlers; using Server.Spells; using Server.Spells.Bushido; -using Server.Spells.Fifth; -using Server.Spells.First; using Server.Spells.Fourth; -using Server.Spells.Mysticism; using Server.Spells.Necromancy; using Server.Spells.Ninjitsu; -using Server.Spells.Second; using Server.Spells.Sixth; using Server.Spells.Spellweaving; using Server.Targeting; diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj index 60e867724..dc8bd531f 100644 --- a/Projects/UOContent/UOContent.csproj +++ b/Projects/UOContent/UOContent.csproj @@ -38,16 +38,16 @@ false - + - + - + From 2fded438885bc7ed4445b0fae3ead3ed7865fc02 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Mon, 30 Dec 2024 13:54:39 -0800 Subject: [PATCH 3/7] feat: Adds exception message to logger for TCP Server and streamlines logger messages. (#2037) --- Projects/Server/Network/TcpServer.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Projects/Server/Network/TcpServer.cs b/Projects/Server/Network/TcpServer.cs index 52a5201c8..d2c6751c8 100644 --- a/Projects/Server/Network/TcpServer.cs +++ b/Projects/Server/Network/TcpServer.cs @@ -62,7 +62,7 @@ public static class TcpServer foreach (var ipep in listeningAddresses) { - logger.Information("Listening: {Address}:{Port}", ipep.Address, ipep.Port); + logger.Information("Listening: {Address}", ipep); } ListeningAddresses = listeningAddresses.ToArray(); @@ -107,16 +107,16 @@ public static class TcpServer // WSAEADDRINUSE if (se.ErrorCode == 10048) { - logger.Warning("Listener: {Address}:{Port}: Failed (In Use)", ipep.Address, ipep.Port); + logger.Warning("Listener: {Address} Exception: {Reason}", ipep, "Currently in use"); } // WSAEADDRNOTAVAIL else if (se.ErrorCode == 10049) { - logger.Warning("Listener {Address}:{Port}: Failed (Unavailable)", ipep.Address, ipep.Port); + logger.Warning("Listener {Address} Exception: {Reason}", ipep, "Unavailable"); } else { - logger.Warning(se, "Listener Exception:"); + logger.Warning(se, "Listener {Address} Exception: {Reason}", ipep, se.Message); } } From ade7393e877002f48f3a1ce9e3e8950cd3864cfd Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Mon, 30 Dec 2024 19:04:46 -0800 Subject: [PATCH 4/7] chore(deps): Bumps modernuo schema generator to 2.12.18 (#2039) --- .config/dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 03eaff932..73eb8d9a0 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "modernuoschemagenerator": { - "version": "2.12.13", + "version": "2.12.18", "commands": [ "ModernUOSchemaGenerator" ] From 333b40872a07aae91312f868f623cb30de5d17ec Mon Sep 17 00:00:00 2001 From: Bohica <53943479+Bohicatv@users.noreply.github.com> Date: Mon, 30 Dec 2024 19:45:21 -0800 Subject: [PATCH 5/7] fix: Add Iron Gate decorations to Vesper Graveyard in Felucca and Trammel (#2008) --- Distribution/Data/Decoration/Felucca/VesperGraveyard.cfg | 7 +++++++ Distribution/Data/Decoration/Trammel/VesperGraveyard.cfg | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 Distribution/Data/Decoration/Felucca/VesperGraveyard.cfg create mode 100644 Distribution/Data/Decoration/Trammel/VesperGraveyard.cfg diff --git a/Distribution/Data/Decoration/Felucca/VesperGraveyard.cfg b/Distribution/Data/Decoration/Felucca/VesperGraveyard.cfg new file mode 100644 index 000000000..5936a98f3 --- /dev/null +++ b/Distribution/Data/Decoration/Felucca/VesperGraveyard.cfg @@ -0,0 +1,7 @@ +# Iron Gate right +IronGateShort 0x0856 (Facing=NorthCCW) +2783 867 0 + +# Iron Gate left +IronGateShort 0x0854 (Facing=SouthCW) +2783 868 0 diff --git a/Distribution/Data/Decoration/Trammel/VesperGraveyard.cfg b/Distribution/Data/Decoration/Trammel/VesperGraveyard.cfg new file mode 100644 index 000000000..5936a98f3 --- /dev/null +++ b/Distribution/Data/Decoration/Trammel/VesperGraveyard.cfg @@ -0,0 +1,7 @@ +# Iron Gate right +IronGateShort 0x0856 (Facing=NorthCCW) +2783 867 0 + +# Iron Gate left +IronGateShort 0x0854 (Facing=SouthCW) +2783 868 0 From 9d0d454b4e05b5db4e8bba3e061dc3137b3b2b7b Mon Sep 17 00:00:00 2001 From: Guyute Date: Mon, 30 Dec 2024 23:25:34 -0500 Subject: [PATCH 6/7] feat: Moves logger to a separate assembly for reuse (#2001) --- .gitignore | 2 ++ ModernUO.sln | 8 ++++++++ .../{Server/Logging => Logger}/ILogger.cs | 0 .../{Server/Logging => Logger}/LogFactory.cs | 0 Projects/Logger/Logger.csproj | 20 +++++++++++++++++++ .../Logging => Logger}/SerilogLogger.cs | 0 Projects/Server/Server.csproj | 1 + Projects/UOContent/UOContent.csproj | 1 + 8 files changed, 32 insertions(+) rename Projects/{Server/Logging => Logger}/ILogger.cs (100%) rename Projects/{Server/Logging => Logger}/LogFactory.cs (100%) create mode 100644 Projects/Logger/Logger.csproj rename Projects/{Server/Logging => Logger}/SerilogLogger.cs (100%) diff --git a/.gitignore b/.gitignore index a0bf66daf..d4c5e3b5f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ # Distribution Files +/Distribution/Logger +/Distribution/Logger.* /Distribution/ModernUO /Distribution/ModernUO.* /Distribution/Server diff --git a/ModernUO.sln b/ModernUO.sln index 779005fbe..6a43a203a 100644 --- a/ModernUO.sln +++ b/ModernUO.sln @@ -12,6 +12,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UOContent.Tests", "Projects EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Application", "Projects\Application\Application.csproj", "{E9849FA1-D4F5-4D68-A36B-249F4CB4E374}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logger", "Projects\Logger\Logger.csproj", "{ECAD3793-A7C5-4546-AA88-77DD24574410}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Analyze|Any CPU = Analyze|Any CPU @@ -49,6 +51,12 @@ Global {E9849FA1-D4F5-4D68-A36B-249F4CB4E374}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9849FA1-D4F5-4D68-A36B-249F4CB4E374}.Release|Any CPU.ActiveCfg = Release|Any CPU {E9849FA1-D4F5-4D68-A36B-249F4CB4E374}.Release|Any CPU.Build.0 = Release|Any CPU + {ECAD3793-A7C5-4546-AA88-77DD24574410}.Analyze|Any CPU.ActiveCfg = Analyze|Any CPU + {ECAD3793-A7C5-4546-AA88-77DD24574410}.Analyze|Any CPU.Build.0 = Analyze|Any CPU + {ECAD3793-A7C5-4546-AA88-77DD24574410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ECAD3793-A7C5-4546-AA88-77DD24574410}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ECAD3793-A7C5-4546-AA88-77DD24574410}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ECAD3793-A7C5-4546-AA88-77DD24574410}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Projects/Server/Logging/ILogger.cs b/Projects/Logger/ILogger.cs similarity index 100% rename from Projects/Server/Logging/ILogger.cs rename to Projects/Logger/ILogger.cs diff --git a/Projects/Server/Logging/LogFactory.cs b/Projects/Logger/LogFactory.cs similarity index 100% rename from Projects/Server/Logging/LogFactory.cs rename to Projects/Logger/LogFactory.cs diff --git a/Projects/Logger/Logger.csproj b/Projects/Logger/Logger.csproj new file mode 100644 index 000000000..e94ae59a8 --- /dev/null +++ b/Projects/Logger/Logger.csproj @@ -0,0 +1,20 @@ + + + Server + Logger + ModernUO Logger + ..\..\Distribution\Assemblies + ..\..\Distribution\Assemblies + Debug;Release;Analyze + + + + + + + + + + + + diff --git a/Projects/Server/Logging/SerilogLogger.cs b/Projects/Logger/SerilogLogger.cs similarity index 100% rename from Projects/Server/Logging/SerilogLogger.cs rename to Projects/Logger/SerilogLogger.cs diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj index 123ad7a73..443802d8a 100644 --- a/Projects/Server/Server.csproj +++ b/Projects/Server/Server.csproj @@ -33,6 +33,7 @@ + diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj index dc8bd531f..f6b8b40d6 100644 --- a/Projects/UOContent/UOContent.csproj +++ b/Projects/UOContent/UOContent.csproj @@ -34,6 +34,7 @@ + false From b6e31217a2545b8f944e74150bb27ef69b901c5b Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Tue, 31 Dec 2024 02:52:58 -0800 Subject: [PATCH 7/7] chore(license): Removes CLA requirement. All contributors moving forward will retain copyright. (#2038) --- CONTRIBUTING.md | 2 -- version.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7344d9b80..a1df0f57f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,7 +28,6 @@ We accept fixes and features! Here are some resources to help you get started on If you don't know what a pull request is read this article: https://help.github.com/articles/using-pull-requests. Make sure the repository can build and all tests pass. Familiarize yourself with the project workflow and our coding conventions. -1. Sign a [Contributor License Agreement](https://cla-assistant.io/modernuo/ModernUO) when submitting your pull request. 1. Ensure all files have the appropriate [LICENSE](/LICENSE) header (Line 634-649) 1. Ensure any install or build dependencies are removed. 1. Update the README.md with details of changes to the interface, this includes new build process, @@ -38,6 +37,5 @@ If you don't know what a pull request is read this article: https://help.github. 1. You may merge the Pull Request in once you have the sign-off of two other developers, or if you do not have permission to do that, you may request the second reviewer to merge it for you. -[aspnet-contributing]: https://github.com/aspnet/AspNetCore/blob/456dbf1309f9fcae1d7b376784088dcd7818c01e/CONTRIBUTING.md [homepage]: http://contributor-covenant.org [version]: http://contributor-covenant.org/version/1/4/ diff --git a/version.json b/version.json index 6221a7f26..3bb3f304b 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "0.13.7" + "version": "0.14.0" }