Merge branch 'master' of git://github.com/EQEmu/Server

This commit is contained in:
KayenEQ 2014-02-10 10:10:47 -05:00
commit 835d2ef74c
2 changed files with 1 additions and 3 deletions

View File

@ -2,6 +2,7 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50)
-------------------------------------------------------
== 02/09/2014 ==
Sorvani: Added new spawn condition onchange action: DoRepopIfReady. Choosing this will not repop mobs when the spawn condition is enabled if they have an existing respawn timer. Additionally, this condition will not even attempt repop when the condition is is changed to disabled. Will be in use on PEQ for: Cragbeast Queen in Natimbi.
Secrets: Fixed a weird crash issue with deletion of pointers if task loading fails.
== 02/8/2014 ==
Kayen: Various updates/fixes/clean-ups to focus effect related code. Focus effect limits should now all work properly.

View File

@ -585,7 +585,6 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
else {
LogFile->write(EQEMuLog::Error, ERR_MYSQLERROR1, errbuf);
safe_delete_array(query);
safe_delete(state);
return false;
}
@ -659,7 +658,6 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
else {
LogFile->write(EQEMuLog::Error, ERR_MYSQLERROR2, errbuf);
safe_delete_array(query);
safe_delete(state);
return false;
}
@ -738,7 +736,6 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state) {
else {
LogFile->write(EQEMuLog::Error, ERR_MYSQLERROR3, errbuf);
safe_delete_array(query);
safe_delete(state);
return false;
}
}