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

[11329] Fix crash in ChatHandler::HandleNpcDeleteCommand() - correctly despawn TemporarySummon objects by using TemporarySummon::UnSummon() function.

Browse source 
Signed-off-by: Ambal <pogrebniak@gala.net>
This commit is contained in:
Ambal 2011-04-11 22:07:43 +03:00
parent 347070c4bc
commit 735f086992
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/game/Level2.cpp
View file

@ -41,6 +41,7 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <map> #include <map>
#include "TemporarySummon.h"
#include "TargetedMovementGenerator.h" // for HandleNpcUnFollowCommand #include "TargetedMovementGenerator.h" // for HandleNpcUnFollowCommand
@ -1818,9 +1819,17 @@ bool ChatHandler::HandleNpcDeleteCommand(char* args)
} }
// Delete the creature // Delete the creature
if(!unit->IsTemporarySummon())
{
unit->CombatStop(); unit->CombatStop();
unit->DeleteFromDB(); unit->DeleteFromDB();
unit->AddObjectToRemoveList(); unit->AddObjectToRemoveList();
}
else
{
TemporarySummon * pSummon = static_cast<TemporarySummon* >(unit);
pSummon->UnSummon();
}
SendSysMessage(LANG_COMMAND_DELCREATMESSAGE); SendSysMessage(LANG_COMMAND_DELCREATMESSAGE);

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 "11328" #define REVISION_NR "11329"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__