summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-22 15:38:43 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-22 15:38:43 +0000
commit8c59c48a21dc4272353cc31d14ba35a7a7be2f80 (patch)
tree2122bd483842d1144b9d4348c97d330f78fced58
parenta21bc85c2316d2ecbb1d1b2f6bdcc055928faf60 (diff)
downloadhercules-8c59c48a21dc4272353cc31d14ba35a7a7be2f80.tar.gz
hercules-8c59c48a21dc4272353cc31d14ba35a7a7be2f80.tar.bz2
hercules-8c59c48a21dc4272353cc31d14ba35a7a7be2f80.tar.xz
hercules-8c59c48a21dc4272353cc31d14ba35a7a7be2f80.zip
* Fixed map server getting notified of hair, hair color, gender, class and level changes from a char server (TXT only) twice (since r2986).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14485 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/char/int_guild.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index a3426bd21..a218ef196 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ Date Added
* mail_deliveryfail no longer attempts to log (since r12910) and give items (since r11855), when there is no item attached to the mail (bugreport:3239). [Ai4rei]
* Fixed a crash when shutting down char-server (TXT only), after it failed to load storage save data (since r1275). [Ai4rei]
* Batch files (Windows) now detect whether the server crashed, aborted or shutdown cleanly (Ctrl+C or @mapexit) and print appropriate message, instead of always assuming, that the server crashed (bugreport:3476, since r1818). [Ai4rei]
+ * Fixed map server getting notified of hair, hair color, gender, class and level changes from a char server (TXT only) twice (since r2986). [Ai4rei]
2010/11/21
* Added msinttypes (rev. 26, http://msinttypes.googlecode.com/svn/trunk/) portability framework for Visual C++ compilers (related bugreport:4059). [Ai4rei]
* Added 64-bit variants of the socket and buffer I/O macros. [Ai4rei]
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index f5f7222f9..01d88e4f2 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -1237,6 +1237,7 @@ int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int
switch(type) {
case GMI_POSITION: // –ðE
g->member[i].position = *((int *)data);
+ mapif_guild_memberinfochanged(guild_id, account_id, char_id, type, data, len);
break;
case GMI_EXP: // EXP
{
@@ -1254,6 +1255,7 @@ int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int
guild_calcinfo(g);
mapif_guild_basicinfochanged(guild_id,GBI_EXP,&g->exp,4);
}
+ mapif_guild_memberinfochanged(guild_id, account_id, char_id, type, data, len);
break;
}
case GMI_HAIR:
@@ -1291,7 +1293,6 @@ int mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, int
ShowError("int_guild: GuildMemberInfoChange: Unknown type %d\n", type);
break;
}
- mapif_guild_memberinfochanged(guild_id, account_id, char_id, type, data, len);
return 0;
}