Browse Source

Fixed right-click npc unload not unloading duplicates (bugreport:2014)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13070 54d463be-8e91-2dee-dedb-b68131a5f0ec
ultramage 17 years ago
parent
commit
6c4b0e2676
2 changed files with 5 additions and 0 deletions
  1. 2 0
      Changelog-Trunk.txt
  2. 3 0
      src/map/clif.c

+ 2 - 0
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)

+ 3 - 0
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));