- Added an answer to a FlavioJS's comment, and added a question myself (npc.c/script.c respectively)

- Fixed add_str in script.h not being updated to const char as well. But why do we really need such a script-engine low-level function exposed to the rest of files? :/
- Moved the strip unequip code to before deleting the timer, this fixes trying to "re-strip" someone causing the skill to fail and on top of that terminate their current strip effect.
- Added an ugly work around to the issue of skills with additional effect causing opt1 status when they have just terminated them (in short, you shouldn't be able to hit someone with, say, sleep, and then have the same skill cause them stun, since both are opt1 values).
- Reading of TK Mission variables will now happen if you are a TK-class character regardless of whether you know TK_MISSION or not. Should fix being able to reset skills to reset your Mission data.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9537 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 1 deletions

diff --git a/src/map/pc.c b/src/map/pc.c
index f6923a8c2..5fdb19378 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -795,7 +795,8 @@ int pc_reg_received(struct map_session_data *sd)
 	sd->change_level = pc_readglobalreg(sd,"jobchange_level");
 	sd->die_counter = pc_readglobalreg(sd,"PC_DIE_COUNTER");
 
-	if (pc_checkskill(sd, TK_MISSION)) {
+	if ((sd->class_&MAPID_BASEMASK)==MAPID_TAEKWON)
+  	{	//Better check for class rather than skill to prevent "skill resets" from unsetting this
 		sd->mission_mobid = pc_readglobalreg(sd,"TK_MISSION_ID");
 		sd->mission_count = pc_readglobalreg(sd,"TK_MISSION_COUNT");
 	}