Merge branch 'master' into dotnet8

MUnique · Nov 16, 2023 · 2b08e9e · 2b08e9e
2 parents 947051b + a9c8461
commit 2b08e9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/GameLogic/PlugIns/SelfDefensePlugIn.cs b/src/GameLogic/PlugIns/SelfDefensePlugIn.cs
@@ -15,7 +15,7 @@ namespace MUnique.OpenMU.GameLogic.PlugIns;
 /// Updates the state of the active self defenses on every second and every hit.
 /// </summary>
 [PlugIn(nameof(SelfDefensePlugIn), "Updates the state of the self defense system.")]
-[Guid("3E702A15-653A-48EF-899C-4CDB2239A90C")]
+[Guid("BA4753EA-4D2B-488C-BB6B-4A127E28630A")]
 public class SelfDefensePlugIn : IPeriodicTaskPlugIn, IAttackableGotHitPlugIn, ISupportCustomConfiguration<SelfDefensePlugInConfiguration>, ISupportDefaultCustomConfiguration
 {
     /// <inheritdoc />

diff --git a/tests/MUnique.OpenMU.ChatServer.Tests/ChatClientTests.cs b/tests/MUnique.OpenMU.ChatServer.Tests/ChatClientTests.cs
@@ -145,7 +145,7 @@ public async Task SentMessageEncryptedProperlyAsync()
         var duplexPipe = new DuplexPipe();
         var connection = new Connection(duplexPipe, null, null, new NullLogger<Connection>());
         var client = new ChatClient(connection, manager, new NullLogger<ChatClient>());
-        var expectedPacket = new byte[] { 0xC1, 0x0C, 0x04, 0x01, 0x06, 0xBD, 0x8E, 0xEA, 0xBD, 0x8E, 0xEA, 0xFC };
+        var expectedPacket = new byte[] { 0xC1, 0x0B, 0x04, 0x01, 0x06, 0xBD, 0x8E, 0xEA, 0xBD, 0x8E, 0xEA };
         await client.SendMessageAsync(1, "AAAAAA").ConfigureAwait(false);
         var sendResult = await duplexPipe.SendPipe.Reader.ReadAsync().ConfigureAwait(false);
         var sentPacket = sendResult.Buffer.ToArray();