1 files changed, 25 insertions, 23 deletions
diff --git a/src/server/game/Handlers/TicketHandler.cpp b/src/server/game/Handlers/TicketHandler.cpp
index ef1332dc4a2..af1b54218cd 100644
--- a/src/server/game/Handlers/TicketHandler.cpp
+++ b/src/server/game/Handlers/TicketHandler.cpp
@@ -40,30 +40,32 @@ void WorldSession::HandleGMTicketSystemStatusOpcode(WorldPackets::Ticket::GMTick
     SendPacket(response.Write());
 }
 
-void WorldSession::HandleSupportTicketSubmitBug(WorldPackets::Ticket::SupportTicketSubmitBug& packet)
+void WorldSession::HandleSubmitUserFeedback(WorldPackets::Ticket::SubmitUserFeedback& userFeedback)
 {
-    if (!sSupportMgr->GetBugSystemStatus())
-        return;
-
-    BugTicket* ticket = new BugTicket(GetPlayer());
-    ticket->SetPosition(packet.Header.MapID, packet.Header.Position);
-    ticket->SetFacing(packet.Header.Facing);
-    ticket->SetNote(packet.Note);
-
-    sSupportMgr->AddTicket(ticket);
-}
-
-void WorldSession::HandleSupportTicketSubmitSuggestion(WorldPackets::Ticket::SupportTicketSubmitSuggestion& packet)
-{
-    if (!sSupportMgr->GetSuggestionSystemStatus())
-        return;
-
-    SuggestionTicket* ticket = new SuggestionTicket(GetPlayer());
-    ticket->SetPosition(packet.Header.MapID, packet.Header.Position);
-    ticket->SetFacing(packet.Header.Facing);
-    ticket->SetNote(packet.Note);
-
-    sSupportMgr->AddTicket(ticket);
+    if (userFeedback.IsSuggestion)
+    {
+        if (!sSupportMgr->GetSuggestionSystemStatus())
+            return;
+
+        SuggestionTicket* ticket = new SuggestionTicket(GetPlayer());
+        ticket->SetPosition(userFeedback.Header.MapID, userFeedback.Header.Position);
+        ticket->SetFacing(userFeedback.Header.Facing);
+        ticket->SetNote(userFeedback.Note);
+
+        sSupportMgr->AddTicket(ticket);
+    }
+    else
+    {
+        if (!sSupportMgr->GetBugSystemStatus())
+            return;
+
+        BugTicket* ticket = new BugTicket(GetPlayer());
+        ticket->SetPosition(userFeedback.Header.MapID, userFeedback.Header.Position);
+        ticket->SetFacing(userFeedback.Header.Facing);
+        ticket->SetNote(userFeedback.Note);
+
+        sSupportMgr->AddTicket(ticket);
+    }
 }
 
 void WorldSession::HandleSupportTicketSubmitComplaint(WorldPackets::Ticket::SupportTicketSubmitComplaint& packet)