mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 19:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10831] Fixed crash at send mail from console

Browse source 
Inspired by patch from rsa.
This commit is contained in:
VladimirMangos 2010-12-07 03:34:45 +03:00
parent 81b6cb2751
commit 4ad58ecb49
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/Level1.cpp
View file

@ -1768,7 +1768,7 @@ bool ChatHandler::HandleSendMailCommand(char* args)
std::string text = msgText; std::string text = msgText;
// from console show nonexistent sender // from console show nonexistent sender
MailSender sender(m_session ? m_session->GetPlayer() : NULL, MAIL_STATIONERY_GM); MailSender sender(MAIL_NORMAL, m_session ? m_session->GetPlayer()->GetObjectGuid().GetCounter() : 0, MAIL_STATIONERY_GM);
MailDraft(subject, text) MailDraft(subject, text)
.SendMailTo(MailReceiver(target, target_guid),sender); .SendMailTo(MailReceiver(target, target_guid),sender);

4
src/game/Level3.cpp
View file

@ -6545,7 +6545,7 @@ bool ChatHandler::HandleSendItemsCommand(char* args)
} }
// from console show nonexistent sender // from console show nonexistent sender
MailSender sender(m_session ? m_session->GetPlayer() : NULL, MAIL_STATIONERY_GM); MailSender sender(MAIL_NORMAL, m_session ? m_session->GetPlayer()->GetObjectGuid().GetCounter() : 0, MAIL_STATIONERY_GM);
// fill mail // fill mail
MailDraft draft(subject, text); MailDraft draft(subject, text);
@ -6597,7 +6597,7 @@ bool ChatHandler::HandleSendMoneyCommand(char* args)
std::string text = msgText; std::string text = msgText;
// from console show nonexistent sender // from console show nonexistent sender
MailSender sender(m_session ? m_session->GetPlayer() : NULL, MAIL_STATIONERY_GM); MailSender sender(MAIL_NORMAL, m_session ? m_session->GetPlayer()->GetObjectGuid().GetCounter() : 0, MAIL_STATIONERY_GM);
MailDraft(subject, text) MailDraft(subject, text)
.AddMoney(money) .AddMoney(money)

2
src/game/Mail.cpp
View file

@ -485,7 +485,7 @@ void WorldSession::HandleMailTakeItem(WorldPacket & recv_data )
{ {
MailDraft(m->subject, "") MailDraft(m->subject, "")
.AddMoney(m->COD) .AddMoney(m->COD)
.SendMailTo(MailReceiver(sender, sender_guid), MailSender(MAIL_NORMAL, m->receiverGuid.GetCounter()), MAIL_CHECK_MASK_COD_PAYMENT); .SendMailTo(MailReceiver(sender, sender_guid), _player, MAIL_CHECK_MASK_COD_PAYMENT);
} }
pl->ModifyMoney( -int32(m->COD) ); pl->ModifyMoney( -int32(m->COD) );

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10830" #define REVISION_NR "10831"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__