fix: server message crash

tiltedphoques · Apr 17, 2022 · 645edf1 · 645edf1
1 parent a51a909
commit 645edf1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/Code/client/Services/Generic/CommandService.cpp b/Code/client/Services/Generic/CommandService.cpp
@@ -30,9 +30,9 @@ void CommandService::OnCommandEvent(const CommandEvent& acEvent) noexcept
         TeleportCommandRequest request{};
         request.TargetPlayer = acEvent.Command.substr(commandWordPos + 1, acEvent.Command.size());
 
-        spdlog::info("Target player: '{}'", request.TargetPlayer);
-
         m_transport.Send(request);
+
+        spdlog::info("Target player: '{}'", request.TargetPlayer);
     }
     else
     {
@@ -42,6 +42,7 @@ void CommandService::OnCommandEvent(const CommandEvent& acEvent) noexcept
 
 void CommandService::OnTeleportCommandResponse(const TeleportCommandResponse& acMessage) noexcept
 {
+    spdlog::info("TeleportCommandResponse: {:X}:{:X} at position {}, {}, {}", acMessage.CellId.ModId, acMessage.CellId.BaseId, acMessage.Position.x, acMessage.Position.y, acMessage.Position.z);
     auto& modSystem = m_world.GetModSystem();
 
     const uint32_t cellId = modSystem.GetGameId(acMessage.CellId);

diff --git a/Code/encoding/Messages/ServerMessageFactory.h b/Code/encoding/Messages/ServerMessageFactory.h
@@ -41,6 +41,7 @@
 #include <Messages/NotifySyncExperience.h>
 #include <Messages/NotifyEquipmentChanges.h>
 #include <Messages/NotifyChatMessageBroadcast.h>
+#include <Messages/TeleportCommandResponse.h>
 
 using TiltedPhoques::UniquePtr;
 
@@ -59,7 +60,8 @@ struct ServerMessageFactory
                                  NotifyLockChange, AssignObjectsResponse, NotifyDeathStateChange, NotifyOwnershipTransfer,
                                  NotifyObjectInventoryChanges, NotifySpellCast, NotifyProjectileLaunch, NotifyInterruptCast,
                                  NotifyAddTarget, NotifyScriptAnimation, NotifyDrawWeapon, NotifyMount, NotifyNewPackage,
-                                 NotifyRespawn, NotifySyncExperience, NotifyEquipmentChanges, NotifyChatMessageBroadcast>;
+                                 NotifyRespawn, NotifySyncExperience, NotifyEquipmentChanges, NotifyChatMessageBroadcast,
+                                 TeleportCommandResponse>;
 
         return s_visitor(std::forward<T>(func));
     }

diff --git a/Code/encoding/Messages/TeleportCommandResponse.cpp b/Code/encoding/Messages/TeleportCommandResponse.cpp
@@ -8,6 +8,8 @@ void TeleportCommandResponse::SerializeRaw(TiltedPhoques::Buffer::Writer& aWrite
 
 void TeleportCommandResponse::DeserializeRaw(TiltedPhoques::Buffer::Reader& aReader) noexcept
 {
+    ServerMessage::DeserializeRaw(aReader);
+
     CellId.Deserialize(aReader);
     Position.Deserialize(aReader);
 }
diff --git a/Code/server/Services/CommandService.cpp b/Code/server/Services/CommandService.cpp
@@ -37,5 +37,7 @@ void CommandService::OnTeleportCommandRequest(const PacketEvent<TeleportCommandR
         }
     }
 
+    spdlog::info("TeleportCommandResponse: {:X}:{:X} at position {}, {}, {}", response.CellId.ModId, response.CellId.BaseId, response.Position.x, response.Position.y, response.Position.z);
+
     acMessage.pPlayer->Send(response);
 }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
+        spdlog::info("TeleportCommandResponse: {:X}:{:X} at position {}, {}, {}", response.CellId.ModId, response.CellId.BaseId, response.Position.x, response.Position.y, response.Position.z);
         acMessage.pPlayer->Send(response);
     }