[Fixed]:

- Restoration and saving of sd->npc_id must be done every time. 

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6904 54d463be-8e91-2dee-dedb-b68131a5f0ec

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/05/31
+	* [Fixed]:
+	  - Restoration and saving of sd->npc_id must be done every time. [Lance]
 	* Added back the Freeze/Petrify adjustments of -50%def and +25%mdef (when
 	  where these lost?). Thanks to Buuyo for pointing it out. [Skotlex]
 	* Corrected the mob_ai&2 setting triggering rude-attacked due to can't walk
@@ -23,6 +25,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 	  [Skotlex]
 	* Cleaned up and corrected the calculation of hit/flee/cri/lucky dodge in
 	  status_calc_bl. [Skotlex]
+	* [Fixed]:
+	  - Incorrect SQL syntax in login.c (missing collumn) [Lance]
 	* [Improved]:
 	  - SQL upgrade file for the new loginlog. Thanks to ultramage. [Lance]
 	* [Fixed]:

src/map/script.c

@@ -11475,8 +11475,8 @@ int run_script(struct script_code *rootscript,int pos,int rid,int oid)
 				bck_scriptstate = sd->npc_scriptstate;
 				bck_stack = sd->stack;
 				sd->stack = NULL;
-				bck_npcid = sd->npc_id;
 			}
+			bck_npcid = sd->npc_id;
 			sd->npc_id = oid;
 		}
 	}