Merge branch 'master' of git://gitorious.org/tmw-eathena/mainline

1 files changed, 9 insertions, 3 deletions

diff --git a/src/map/tmw.c b/src/map/tmw.c
index 25aa55b..a19eb26 100644
--- a/src/map/tmw.c
+++ b/src/map/tmw.c
@@ -68,10 +68,12 @@ int tmw_CheckChatSpam(struct map_session_data *sd, char* message) {
 	if (sd->chat_lines_in >= battle_config.chat_spam_flood || sd->chat_total_repeats >= battle_config.chat_spam_flood) {
 		sd->chat_lines_in = sd->chat_total_repeats = 0;
 
-		if (battle_config.chat_spam_ban > 0) {
+		if (battle_config.chat_spam_ban > 0 && !sd->auto_ban_info.in_progress) {
 			tmw_GmHackMsg("%s has been autobanned for chat spam", sd->status.name);
 			gm_log("server(0,0) Server : @autoban %s %dh (chat spam)", sd->status.name, battle_config.chat_spam_ban);
 
+			sd->auto_ban_info.in_progress = 1;
+
 			clif_displaymessage(sd->fd, "You have been banned for spamming. Please do not spam.");
 			chrif_char_ask_name(-1, sd->status.name, 2, 0, 0, 0, battle_config.chat_spam_ban, 0, 0); // type: 2 - ban (year, month, day, hour, minute, second)
 			clif_setwaitclose(sd->fd);
@@ -146,10 +148,12 @@ int tmw_CheckTradeSpam(struct map_session_data *sd) {
 	if (sd->trades_in >= battle_config.trade_spam_flood) {
 		sd->trades_in = 0;
 
-		if (battle_config.trade_spam_ban > 0) {
+		if (battle_config.trade_spam_ban > 0 && !sd->auto_ban_info.in_progress) {
 			tmw_GmHackMsg("%s has been autobanned for trade spam", sd->status.name);
 			gm_log("server(0,0) Server : @autoban %s %dh (trade spam)", sd->status.name, battle_config.trade_spam_ban);
 
+			sd->auto_ban_info.in_progress = 1;
+
 			clif_displaymessage(sd->fd, "You have been banned for trade spamming. Please do not trade spam.");
 			chrif_char_ask_name(-1, sd->status.name, 2, 0, 0, 0, battle_config.trade_spam_ban, 0, 0); // type: 2 - ban (year, month, day, hour, minute, second)
 			clif_setwaitclose(sd->fd);
@@ -181,10 +185,12 @@ int tmw_CheckSitSpam(struct map_session_data *sd) {
 	if (sd->sits_in >= battle_config.sit_spam_flood) {
 		sd->sits_in = 0;
 
-		if (battle_config.sit_spam_ban > 0) {
+		if (battle_config.sit_spam_ban > 0 && !sd->auto_ban_info.in_progress) {
 			tmw_GmHackMsg("%s has been autobanned for sit spam", sd->status.name);
 			gm_log("server(0,0) Server : @autoban %s %dh (sit spam)", sd->status.name, battle_config.sit_spam_ban);
 
+			sd->auto_ban_info.in_progress = 1;
+
 			clif_displaymessage(sd->fd, "You have been banned for sit spamming. Please do not sit spam.");
 			chrif_char_ask_name(-1, sd->status.name, 2, 0, 0, 0, battle_config.sit_spam_ban, 0, 0); // type: 2 - ban (year, month, day, hour, minute, second)
 			clif_setwaitclose(sd->fd);