Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2025-02-19 22:29:36 +08:00
parent d1032678ff
commit 7d431dc796
277 changed files with 7092 additions and 5050 deletions
+10 -1
View File
@@ -25,6 +25,7 @@
#include "Log.h"
#include "Opcodes.h"
#include "Player.h"
#include "ScriptMgr.h"
#include "World.h"
#include "WorldPacket.h"
#include "WorldSession.h"
@@ -364,6 +365,8 @@ void TicketMgr::AddTicket(GmTicket* ticket)
++_openTicketCount;
CharacterDatabaseTransaction trans = CharacterDatabaseTransaction(nullptr);
ticket->SaveToDB(trans);
sScriptMgr->OnTicketCreate(ticket);
}
void TicketMgr::CloseTicket(uint32 ticketId, ObjectGuid source)
@@ -375,6 +378,8 @@ void TicketMgr::CloseTicket(uint32 ticketId, ObjectGuid source)
if (source)
--_openTicketCount;
ticket->SaveToDB(trans);
sScriptMgr->OnTicketClose(ticket);
}
}
@@ -398,6 +403,8 @@ void TicketMgr::ResolveAndCloseTicket(uint32 ticketId, ObjectGuid source)
if (source)
--_openTicketCount;
ticket->SaveToDB(trans);
sScriptMgr->OnTicketResolve(ticket);
}
}
@@ -438,7 +445,9 @@ void TicketMgr::SendTicket(WorldSession* session, GmTicket* ticket) const
session->SendPacket(&data);
}
void TicketMgr::UpdateLastChange()
void TicketMgr::UpdateLastChange(GmTicket* ticket)
{
_lastChange = GameTime::GetGameTime().count();
sScriptMgr->OnTicketUpdateLastChange(ticket);
}
+1 -1
View File
@@ -230,7 +230,7 @@ public:
void SetStatus(bool status) { _status = status; }
uint64 GetLastChange() const { return _lastChange; }
void UpdateLastChange();
void UpdateLastChange(GmTicket* ticket);
uint32 GenerateTicketId() { return ++_lastTicketId; }
uint32 GetOpenTicketCount() const { return _openTicketCount; }