diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-14 18:39:18 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-14 18:39:18 +0000 |
| commit | 17d49e6f6d6cd11d75bd40fb7f578536f19f8f3b (patch) | |
| tree | 334253a73794279bb44c4108cd035580a568b2cf | |
| parent | 44f55d3305a0e7968fd55bd5aae90572fac1712e (diff) | |
| download | hercules-17d49e6f6d6cd11d75bd40fb7f578536f19f8f3b.tar.gz hercules-17d49e6f6d6cd11d75bd40fb7f578536f19f8f3b.tar.bz2 hercules-17d49e6f6d6cd11d75bd40fb7f578536f19f8f3b.tar.xz hercules-17d49e6f6d6cd11d75bd40fb7f578536f19f8f3b.zip | |
- Likely fixed "half" of the alliance being saved, which ends up in guilds that can attack another, but not viceversa.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8761 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/char_sql/int_guild.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 19f83cbd2..ce9a5fc63 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/09/14
+ * Likely fixed "half" of the alliance being saved, which ends up in guilds + that can attack another, but not viceversa. [Skotlex] * Added deleting of saved Status changes on character delete for the Char-TXT server. [Skotlex] * Fixed the can-act delay never being checked when requesting to use diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c index 1d190300a..af302346b 100644 --- a/src/char_sql/int_guild.c +++ b/src/char_sql/int_guild.c @@ -294,8 +294,12 @@ int inter_guild_tosql(struct guild *g,int flag) if (flag&GS_ALLIANCE)
{
- // Delete current alliances
- sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d' OR `alliance_id`='%d'",guild_alliance_db, g->guild_id,g->guild_id);
+ // Delete current alliances
+ // NOTE: no need to do it on both sides since both guilds in memory had
+ // their info changed, not to mention this would also mess up oppositions!
+ // [Skotlex]
+// sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d' OR `alliance_id`='%d'",guild_alliance_db, g->guild_id,g->guild_id);
+ sprintf(tmp_sql, "DELETE FROM `%s` WHERE `guild_id`='%d'",guild_alliance_db, g->guild_id);
if(mysql_query(&mysql_handle, tmp_sql) )
{
ShowSQL("DB error - %s\n",mysql_error(&mysql_handle));
|