diff options
| author | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-22 19:41:32 +0000 |
|---|---|---|
| committer | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-22 19:41:32 +0000 |
| commit | 13c0bf2c8cd873ca5ed29c763a3daafa96c0a8ce (patch) | |
| tree | da80ec5e061d804a851c2ed7de54162bc3fe21c3 /src/char | |
| parent | ca6687180056b8f89d7f16827dc22eeacce5f211 (diff) | |
| download | hercules-13c0bf2c8cd873ca5ed29c763a3daafa96c0a8ce.tar.gz hercules-13c0bf2c8cd873ca5ed29c763a3daafa96c0a8ce.tar.bz2 hercules-13c0bf2c8cd873ca5ed29c763a3daafa96c0a8ce.tar.xz hercules-13c0bf2c8cd873ca5ed29c763a3daafa96c0a8ce.zip | |
Community Contribution Time!
* Fixed bugreport:6303: official servers now always reshuffle the dice emoticon. To disable change the configuration to 'no'. Thanks to Vianna for providing the information!
* Fixed bugreport:7026: creating a guild and exiting in a short amount of time wouldn't save the guild properly. Thank you clydelion!
* Fixed bugreport:7030: removed warning introduced by r16987. Thanks Mr. Brian and Sir BuildBot for pointing!
* Fixed bugreport:7031: if a player crashed during warp it would cause OnTouch_ to not trigger anymore. Thanks to flaviojs (eA-r15185) for the fix and Napster for pointing out!
* Fixed bugreport:7032: Clementia and Canto Candidus give an additional of +1 str/agi/dex each 10 job levels (from caster). Thanks solvent!
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17034 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char')
| -rw-r--r-- | src/char/int_guild.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 661d57c1f..0966d2344 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -245,7 +245,7 @@ int inter_guild_tosql(struct guild *g,int flag) m->hair, m->hair_color, m->gender, m->class_, m->lv, m->exp, m->exp_payper, m->online, m->position, esc_name) ) Sql_ShowDebug(sql_handle); - if (m->modified & GS_MEMBER_NEW) + if (m->modified&GS_MEMBER_NEW || new_guild == 1) { if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `guild_id` = '%d' WHERE `char_id` = '%d'", char_db, g->guild_id, m->char_id) ) @@ -1185,7 +1185,7 @@ int mapif_parse_CreateGuild(int fd,int account_id,char *name,struct guild_member g->guild_id= -1; //Request to create guild. // Create the guild - if (!inter_guild_tosql(g,GS_BASIC|GS_POSITION|GS_SKILL)) { + if (!inter_guild_tosql(g,GS_BASIC|GS_POSITION|GS_SKILL|GS_MEMBER)) { //Failed to Create guild.... ShowError("Failed to create Guild %s (Guild Master: %s)\n", g->name, g->master); mapif_guild_created(fd,account_id,NULL); |