diff --git a/marketplace/Empostor.Plugins.Message.dll b/marketplace/Empostor.Plugins.Message.dll index 75e5b4d..2c5186f 100644 Binary files a/marketplace/Empostor.Plugins.Message.dll and b/marketplace/Empostor.Plugins.Message.dll differ diff --git a/src/Empostor.Api.Innersloth.Generator/packages.lock.json b/src/Empostor.Api.Innersloth.Generator/packages.lock.json index aedf17e..fb68fad 100644 --- a/src/Empostor.Api.Innersloth.Generator/packages.lock.json +++ b/src/Empostor.Api.Innersloth.Generator/packages.lock.json @@ -150,7 +150,6 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.3" } } - }, - ".NETStandard,Version=v2.0/linux-x64": {} + } } } \ No newline at end of file diff --git a/src/Empostor.Api/packages.lock.json b/src/Empostor.Api/packages.lock.json index 9c8d1b7..9d991b4 100644 --- a/src/Empostor.Api/packages.lock.json +++ b/src/Empostor.Api/packages.lock.json @@ -34,12 +34,6 @@ "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" } }, - "Microsoft.NET.ILLink.Tasks": { - "type": "Direct", - "requested": "[8.0.27, )", - "resolved": "8.0.27", - "contentHash": "rQi9TxifHRnXP7lVRZH05DxD2/XGbJp12q0ozcbrlBlBnyyzssFTH/2vLhtKWUp2CT1qVscTrcYTFiwTyKPKRg==" - }, "StyleCop.Analyzers": { "type": "Direct", "requested": "[1.2.0-beta.556, )", @@ -145,7 +139,6 @@ "NextFast.Hazel.Abstractions": { "type": "Project" } - }, - "net8.0/linux-x64": {} + } } } \ No newline at end of file diff --git a/src/Empostor.Plugins.Message/MessageEventListener.cs b/src/Empostor.Plugins.Message/MessageEventListener.cs index 3bedb78..0cfebae 100644 --- a/src/Empostor.Plugins.Message/MessageEventListener.cs +++ b/src/Empostor.Plugins.Message/MessageEventListener.cs @@ -2,6 +2,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Empostor.Api.Events; +using Empostor.Api.Events.Game.Player; +using Empostor.Api.Events.Player; namespace Empostor.Plugins.Message; @@ -15,17 +17,14 @@ public sealed class MessageEventListener : IEventListener } [EventListener] - public async ValueTask OnPlayerJoined(IGamePlayerJoinedEvent e) + public async ValueTask OnPlayerReady(IPlayerReadyEvent e) { - var fc = e.Player.Client.FriendCode; + var fc = e.ClientPlayer.Client.FriendCode; if (string.IsNullOrEmpty(fc)) return; var messages = _store.TakeAll(fc); if (messages.Count == 0) return; - var ctrl = e.Player.Character; - if (ctrl == null) return; - var sb = new StringBuilder(); sb.AppendLine(string.Format("--- You have {0} pending message(s) ---", messages.Count)); @@ -35,6 +34,6 @@ public sealed class MessageEventListener : IEventListener sb.AppendLine($"[{time}] <{msg.SenderName}> {msg.Content}"); } - await ctrl.SendChatToPlayerAsync(sb.ToString(), ctrl); + await e.PlayerControl.SendChatToPlayerAsync(sb.ToString(), e.PlayerControl); } } diff --git a/src/Empostor.Server/packages.lock.json b/src/Empostor.Server/packages.lock.json index cc34b07..9d36848 100644 --- a/src/Empostor.Server/packages.lock.json +++ b/src/Empostor.Server/packages.lock.json @@ -58,12 +58,6 @@ "resolved": "8.0.1", "contentHash": "X21b8D6z58EG34OMLH955750mFaEaGs5xLGe9Vyi3059Cgb3sk+p2k/JlQXaieEBRrk+SVlFzDei3Q6PdVzJOA==" }, - "Microsoft.NET.ILLink.Tasks": { - "type": "Direct", - "requested": "[8.0.27, )", - "resolved": "8.0.27", - "contentHash": "rQi9TxifHRnXP7lVRZH05DxD2/XGbJp12q0ozcbrlBlBnyyzssFTH/2vLhtKWUp2CT1qVscTrcYTFiwTyKPKRg==" - }, "Serilog.Extensions.Hosting": { "type": "Direct", "requested": "[8.0.0, )",