diff options
| -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 ); |