summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-01-25 00:38:51 +0000
committerParadox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-01-25 00:38:51 +0000
commitbea2adadf209fad2274d0c4f85e1b4df1ad6beaa (patch)
tree43dfda2c536cc0a7f9ee375925be2895e058aeb0 /src/map
parentc0896d581a8c46fee940eee571c233441a4e78c4 (diff)
downloadhercules-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
Diffstat (limited to 'src/map')
-rw-r--r--src/map/guild.c2
1 files changed, 2 insertions, 0 deletions
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 );