Fix commands not working (#275)

* Update ChatCommandPacket.cs * Remove old method used previously for commands
ObsidianMC · Aug 30, 2022 · ad1bd3d · ad1bd3d
1 parent a955cb3
commit ad1bd3d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 33 deletions.
diff --git a/Obsidian/Net/Packets/Play/Serverbound/ChatCommandPacket.cs b/Obsidian/Net/Packets/Play/Serverbound/ChatCommandPacket.cs
@@ -1,17 +1,19 @@
-using Obsidian.Commands;
+using Microsoft.Extensions.Logging;
+using Obsidian.Commands;
+using Obsidian.Commands.Framework.Entities;
 using Obsidian.Entities;
 using Obsidian.Serialization.Attributes;
+using System.Text;
 
 namespace Obsidian.Net.Packets.Play.Serverbound;
 
-//TODO USE THIS PACKET PROPERLY
 public partial class ChatCommandPacket : IServerboundPacket
 {
     [Field(0)]
     public string Command { get; private set; }
 
     [Field(1)]
-    public long Timestamp { get; private set; }
+    public DateTimeOffset Timestamp { get; private set; }
 
     [Field(2)]
     public long Salt { get; private set; }
@@ -24,5 +26,16 @@ public partial class ChatCommandPacket : IServerboundPacket
 
     public int Id => 0x03;
 
-    public ValueTask HandleAsync(Server server, Player player) => ValueTask.CompletedTask;
+    public async ValueTask HandleAsync(Server server, Player player)
+    {
+        var context = new CommandContext($"/{this.Command}", new CommandSender(CommandIssuers.Client, player, server.Logger), player, server);
+        try
+        {
+            await server.CommandsHandler.ProcessCommand(context);
+        }
+        catch (Exception e)
+        {
+            server.Logger.LogError(e, e.Message);
+        }
+    }
 }
diff --git a/Obsidian/Server.cs b/Obsidian/Server.cs
@@ -402,35 +402,6 @@ internal async Task HandleIncomingMessageAsync(ChatMessagePacket packet, Client
         BroadcastMessage(playerChatMessagePacket);
     }
 
-    //internal async Task HandleIncomingMessageAsync(string message, string format, Client source, MessageType type = MessageType.Chat)
-    //{
-    //    format ??= "<{0}> {1}";
-
-    //    if (message.StartsWith(CommandHandler.DefaultPrefix))
-    //    {
-    //        // TODO command logging
-    //        // TODO error handling for commands
-    //        var context = new CommandContext(message, new CommandSender(CommandIssuers.Client, source.Player, Logger), source.Player, this);
-    //        try
-    //        {
-    //            await CommandsHandler.ProcessCommand(context);
-    //        }
-    //        catch (Exception e)
-    //        {
-    //            Logger.LogError(e, e.Message);
-    //        }
-    //    }
-    //    else
-    //    {
-    //        var chat = await Events.InvokeIncomingChatMessageAsync(new IncomingChatMessageEventArgs(source.Player, message, format));
-
-    //        if (!chat.Cancel)
-    //            BroadcastMessage(string.Format(format, source.Player.Username, message), type);
-
-    //        return;
-    //    }
-    //}
-
     internal async Task QueueBroadcastPacketAsync(IClientboundPacket packet)
     {
         foreach (Player player in Players)