diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-11 11:00:24 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-11 11:00:24 +0000 |
| commit | 6db2b95add66d72510c69fabfa1c6a0b9ac1b2ba (patch) | |
| tree | c48c9938d101db318627a27a7ca732506ea9b7d2 | |
| parent | 7b7cad3f3b85e76142f365ba8b56b42e95a8a6a1 (diff) | |
| download | hercules-6db2b95add66d72510c69fabfa1c6a0b9ac1b2ba.tar.gz hercules-6db2b95add66d72510c69fabfa1c6a0b9ac1b2ba.tar.bz2 hercules-6db2b95add66d72510c69fabfa1c6a0b9ac1b2ba.tar.xz hercules-6db2b95add66d72510c69fabfa1c6a0b9ac1b2ba.zip | |
Fixed right-click npc unload not unloading duplicates (bugreport:2014)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13070 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 9c91e8300..a443fc34b 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2008/08/11 + * Fixed right-click npc unload not unloading duplicates (bugreport:2014) 2008/08/09 * Fixed @noks leaking internal buffer contents (bugreport:1528) * Now Novices without lvl5 basic skill can be partied (bugreport:1131) diff --git a/src/map/clif.c b/src/map/clif.c index 8b6eb4267..341fa67c5 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -10396,7 +10396,10 @@ void clif_parse_GMKick(int fd, struct map_session_data *sd) lv = get_atcommand_level(atcommand_unloadnpc); if( pc_isGM(sd) < lv ) return; + // copy-pasted from atcommand_unloadnpc + npc_unload_duplicates(nd); npc_unload(nd); + npc_read_event_script(); if( log_config.gm && lv >= log_config.gm ) { char message[256]; sprintf(message, "/kick %s (%d)", status_get_name(target), status_get_class(target)); |