From 552c39acc3e8f74f1a99d855641d67b7f2adf46e Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Tue, 20 Dec 2016 00:13:48 +0100 Subject: [PATCH] Fixed #1809 Thanks to @Tokeiburu --- src/map/atcommand.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/map/atcommand.c b/src/map/atcommand.c index fcae7abd99..fbbd5700ab 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -5815,7 +5815,7 @@ ACMD_FUNC(marry) nullpo_retr(-1, sd); - if (!message || !*message || sscanf(message, "%23s", player_name) != 1) { + if (!message || !*message || sscanf(message, "%23[^\n]", player_name) != 1) { clif_displaymessage(fd, msg_txt(sd,1172)); // Usage: @marry return -1; } @@ -5828,6 +5828,8 @@ ACMD_FUNC(marry) if (pc_marriage(sd, pl_sd)) { clif_displaymessage(fd, msg_txt(sd,1173)); // They are married... wish them well. clif_wedding_effect(&pl_sd->bl); //wedding effect and music [Lupus] + if( pl_sd->bl.m != sd->bl.m ) + clif_wedding_effect(&sd->bl); getring(sd); // Auto-give named rings (Aru) getring(pl_sd); return 0;