summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-03 14:17:51 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-03 14:17:51 +0000
commit6094568a44e60c0ac6021cb9b44973e325dcae6e (patch)
tree604bc3ebe7cdefcdc6ca91474dd22710684129d9
parent4c88bb6068c50726c09de5dd8f17e6e3e71fc7ed (diff)
downloadhercules-6094568a44e60c0ac6021cb9b44973e325dcae6e.tar.gz
hercules-6094568a44e60c0ac6021cb9b44973e325dcae6e.tar.bz2
hercules-6094568a44e60c0ac6021cb9b44973e325dcae6e.tar.xz
hercules-6094568a44e60c0ac6021cb9b44973e325dcae6e.zip
- Fixed a possible crash with @reloadmobdb due to pet loot timers.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8926 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/atcommand.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2f8e78c18..f73180f09 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/10/03
+ * Fixed a possible crash with @reloadmobdb due to pet loot timers.
+ [Skotlex]
* Fixed a possible crash and a memory leak on the login-SQL server when
parsing unban requests. [Skotlex]
* Renamed setting delay_dependon_dex to delay_dependon_agi, the delay of
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 7b566ad61..a981f7e84 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -5479,7 +5479,6 @@ int atcommand_reloadmobdb(
{
nullpo_retr(-1, sd);
mob_reload();
- do_final_pet();
read_petdb();
merc_reload();
clif_displaymessage(fd, msg_txt(98)); // Monster database reloaded.