mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-17 22:51:30 +00:00
Changed some stuff to keep it consistent with old behavior: was seeing crashes related to ptimers on peq.
This commit is contained in:
parent
2ee8e17ac0
commit
adf42c8750
@ -347,7 +347,7 @@ bool PTimerList::Load(Database *db) {
|
|||||||
//if it expired allready, dont bother.
|
//if it expired allready, dont bother.
|
||||||
|
|
||||||
cur = new PersistentTimer(_char_id, type, start_time, timer_time, enabled);
|
cur = new PersistentTimer(_char_id, type, start_time, timer_time, enabled);
|
||||||
if(!cur->Expired(NULL, false))
|
if(!cur->Expired(NULL))
|
||||||
_list[type] = cur;
|
_list[type] = cur;
|
||||||
else
|
else
|
||||||
delete cur;
|
delete cur;
|
||||||
|
|||||||
@ -292,7 +292,7 @@ bool RuleManager::LoadRules(Database *db, const char *ruleset) {
|
|||||||
{
|
{
|
||||||
safe_delete_array(query);
|
safe_delete_array(query);
|
||||||
while((row = mysql_fetch_row(result))) {
|
while((row = mysql_fetch_row(result))) {
|
||||||
if(!SetRule(row[0], row[1],NULL, false))
|
if(!SetRule(row[0], row[1], NULL, false))
|
||||||
_log(RULES__ERROR, "Unable to interpret rule record for %s", row[0]);
|
_log(RULES__ERROR, "Unable to interpret rule record for %s", row[0]);
|
||||||
}
|
}
|
||||||
mysql_free_result(result);
|
mysql_free_result(result);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user