- Corrected the define for NK no cardfix (def).

- Updated skills that shouldn't ignore the target's cards: Smoking, Fling, Zenynage
- Fixed the char sql server not escaping the server name before inserting it on the ragsrvinfo table.
- Corrected @lvup not doing the party even share check.
- Corrected breaker's misc part not ignoring element.


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

4 files changed, 13 insertions, 15 deletions

diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index f93db50af..de0b79bd1 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -3003,13 +3003,14 @@ int parse_frommap(int fd) {
 			if (RFIFOREST(fd) < 6 || RFIFOREST(fd) < RFIFOW(fd,8))
 				return 0;
 		{
-			char motd[256], t_name[512]; //Required for jstrescapecpy [Skotlex]
+			char motd[256], t_name[2*sizeof(char)*sizeof(server_name)+1], t_motd[512]; //Required for jstrescapecpy [Skotlex]
 			strncpy(motd, RFIFOP(fd,10), 255); //First copy it to make sure the motd fits.
 			motd[255]='\0';
-			jstrescapecpy(t_name,motd);
-
+			jstrescapecpy(t_motd,motd);
+			jstrescapecpy(t_name,server_name);
+		
 			sprintf(tmp_sql, "INSERT INTO `ragsrvinfo` SET `index`='%d',`name`='%s',`exp`='%d',`jexp`='%d',`drop`='%d',`motd`='%s'",
-				fd, server_name, RFIFOW(fd,2), RFIFOW(fd,4), RFIFOW(fd,6), t_name);
+				fd, t_name, RFIFOW(fd,2), RFIFOW(fd,4), RFIFOW(fd,6), t_motd);
 			if (mysql_query(&mysql_handle, tmp_sql)) {
 				ShowSQL("DB error - %s\n",mysql_error(&mysql_handle));
 				ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql);
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index d04867661..1e3af7424 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2725,10 +2725,6 @@ int atcommand_baselevelup(const int fd, struct map_session_data* sd, const char*
 		else
 			sd->status.status_point += status_point;
 		sd->status.base_level += (unsigned int)level;
-		clif_updatestatus(sd, SP_BASELEVEL);
-		clif_updatestatus(sd, SP_NEXTBASEEXP);
-		clif_updatestatus(sd, SP_STATUSPOINT);
-		status_calc_pc(sd, 0);
 		status_percent_heal(&sd->bl, 100, 100);
 		clif_misceffect(&sd->bl, 0);
 		clif_displaymessage(fd, msg_txt(21)); /* Base level raised. */
@@ -2748,14 +2744,15 @@ int atcommand_baselevelup(const int fd, struct map_session_data* sd, const char*
 			sd->status.status_point = 0;
 		else
 			sd->status.status_point -= status_point;
-		clif_updatestatus(sd, SP_STATUSPOINT);
 		sd->status.base_level -= (unsigned int)level;
-		clif_updatestatus(sd, SP_BASELEVEL);
-		clif_updatestatus(sd, SP_NEXTBASEEXP);
-		status_calc_pc(sd, 0);
 		clif_displaymessage(fd, msg_txt(22)); /* Base level lowered. */
 	}
-
+	clif_updatestatus(sd, SP_STATUSPOINT);
+	clif_updatestatus(sd, SP_BASELEVEL);
+	clif_updatestatus(sd, SP_NEXTBASEEXP);
+	status_calc_pc(sd, 0);
+	if(sd->status.party_id)
+		party_send_levelup(sd);
 	return 0;
 }
 
diff --git a/src/map/battle.c b/src/map/battle.c
index 8a0bd5c7d..756e433ce 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2554,7 +2554,7 @@ struct Damage  battle_calc_misc_attack(
 		break ;
 	case ASC_BREAKER:
 		md.damage = 500+rand()%500 + 5*skill_lv * sstatus->int_;
-		nk|=NK_IGNORE_FLEE; //Only Breaker's Misc part always hits.
+		nk|=NK_IGNORE_FLEE|NK_NO_ELEFIX; //These two are not properties of the weapon based part.
 		break;
 	}
 
diff --git a/src/map/skill.h b/src/map/skill.h
index bc850af21..676193d03 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -30,7 +30,7 @@
 #define NK_NO_ELEFIX 0x10
 #define NK_IGNORE_DEF 0x20
 #define NK_IGNORE_FLEE 0x40
-#define NK_NO_CARDFIX_DEF 0x08
+#define NK_NO_CARDFIX_DEF 0x80
 
 //A skill with 3 would be no damage + splash: area of effect.
 //Constants to identify a skill's inf2 value.