diff options
| author | Paradox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-01-25 00:38:51 +0000 |
|---|---|---|
| committer | Paradox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-01-25 00:38:51 +0000 |
| commit | bea2adadf209fad2274d0c4f85e1b4df1ad6beaa (patch) | |
| tree | 43dfda2c536cc0a7f9ee375925be2895e058aeb0 | |
| parent | c0896d581a8c46fee940eee571c233441a4e78c4 (diff) | |
| download | hercules-bea2adadf209fad2274d0c4f85e1b4df1ad6beaa.tar.gz hercules-bea2adadf209fad2274d0c4f85e1b4df1ad6beaa.tar.bz2 hercules-bea2adadf209fad2274d0c4f85e1b4df1ad6beaa.tar.xz hercules-bea2adadf209fad2274d0c4f85e1b4df1ad6beaa.zip | |
Prevented the changing of alliances to oppositions during WoE. (bugreport:3923)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14227 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/guild.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index accbd5344..cfad90154 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2010/01/24 + * Prevented the changing of alliances to oppositions during WoE. (bugreport:3923) [Paradox924X] 2010/01/23 * Prevented pc_skill with a value of 2 for 'flag' from granting a skill level that surpasses MAX_SKILL_LEVEL. (bugreport:4022) [Paradox924X] 2010/01/19 diff --git a/src/map/guild.c b/src/map/guild.c index 280f7aa01..e7b9f4096 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -1456,6 +1456,8 @@ int guild_opposition(struct map_session_data *sd,struct map_session_data *tsd) clif_guild_oppositionack(sd,2); return 0; } + if(agit_flag) // Prevent the changing of alliances to oppositions during WoE. + return 0; //Change alliance to opposition. intif_guild_alliance( sd->status.guild_id,tsd->status.guild_id, sd->status.account_id,tsd->status.account_id,8 ); |