fix: fix TextPacket

engsr6982 · Jun 22, 2024 · c932924 · c932924
1 parent 2377fc5
commit c932924
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/src/Command/Command.cpp b/src/Command/Command.cpp
@@ -1,6 +1,8 @@
 #include "Command.h"
 #include "Utils/Utils.h"
+#include "mc/enums/TextPacketType.h"
 #include "mc/network/packet/RemoveActorPacket.h"
+#include "mc/network/packet/TextPacket.h"
 
 namespace tls::command {
 
@@ -112,12 +114,11 @@ void registerCommand() {
             auto item = param.player.results(origin).data;
             for (Player* target : *item) {
                 if (target) {
-                    TextPacket pkt = TextPacket::createChat(
-                        target->getName(),
-                        param.message.empty() ? "" : param.message,
-                        target->getXuid(),
-                        ""
-                    );
+                    TextPacket pkt{};
+                    pkt.mType    = TextPacketType::Chat;
+                    pkt.mAuthor  = target->getName();
+                    pkt.mMessage = param.message.empty() ? "" : param.message;
+                    pkt.mXuid    = target->getXuid();
                     if (ll::service::getLevel().has_value()) {
                         ll::service::getLevel()->forEachPlayer([&pkt](Player& player) {
                             player.sendNetworkPacket(pkt); // send to all player
@@ -143,7 +144,10 @@ void registerCommand() {
             Actor* entity = origin.getEntity();
             auto&  player = *static_cast<Player*>(entity);
             // processing
-            TextPacket pkt = TextPacket::createChat("Server", param.message.empty() ? "" : param.message, "", "");
+            TextPacket pkt{};
+            pkt.mType    = TextPacketType::Chat;
+            pkt.mMessage = param.message.empty() ? "" : param.message;
+            pkt.mAuthor  = "Server";
             if (ll::service::getLevel().has_value()) {
                 ll::service::getLevel()->forEachPlayer([&pkt](Player& player) {
                     player.sendNetworkPacket(pkt); // send to all player

diff --git a/src/Form/function/BroadCast.cpp b/src/Form/function/BroadCast.cpp
@@ -1,4 +1,5 @@
 #include "include_all.h"
+#include "mc/enums/TextPacketType.h"
 
 namespace tls::form {
 
@@ -24,7 +25,11 @@ void broadCastMessage(Player& player) {
 
         string Message = std::get<string>(dt->at("Message"));
 
-        TextPacket pkt = TextPacket::createChat("Server", Message, "", "");
+        TextPacket pkt{};
+        pkt.mType    = TextPacketType::Chat;
+        pkt.mAuthor  = "Server";
+        pkt.mMessage = Message;
+
         for (auto const& [name, value] : *dt) {
             if (std::holds_alternative<uint64_t>(value)) {
                 auto isTrue = std::get<uint64_t>(value);

diff --git a/src/Form/function/UsePlayerIdentitySay.cpp b/src/Form/function/UsePlayerIdentitySay.cpp
@@ -1,4 +1,5 @@
 #include "include_all.h"
+#include "mc/enums/TextPacketType.h"
 
 namespace tls::form {
 
@@ -30,8 +31,11 @@ void usePlayerIdentitySay(Player& player) {
                 if (isTrue) {
                     Player* playerPtr = ll::service::getLevel()->getPlayer(name);
                     if (playerPtr) {
-                        TextPacket pkt =
-                            TextPacket::createChat(playerPtr->getRealName(), Message, playerPtr->getXuid(), "");
+                        TextPacket pkt{};
+                        pkt.mType    = TextPacketType::Chat;
+                        pkt.mMessage = Message;
+                        pkt.mXuid    = playerPtr->getXuid();
+                        pkt.mAuthor  = playerPtr->getRealName();
                         playerPtr->sendNetworkPacket(pkt); // send to all player
                     } else {
                         sendMsg(pl, "Failed to get player {} pointer"_tr(name));