- Fixed npc_checknear's distance check returning the opposite of what it should (false when the range is correct and viceversa)

- SL_STIN/SL_STUN have dex-reducable casting times now.
- Added a warning on item loading when an item is of equippable type but has no equippable position.
- Turning an alliance to an opposition won't work now during WoE
- Slaves can summon other mobs now. The only ones who can't do this are player summoned mobs.
- Merged the following functions for faster processing of items:
  clif_storageitemlist + clif_storageequiplist = clif_storagelist
  clif_guildstorageitemlist + clif_guildstorageequiplist = clif_guildstoragelist
  clif_itemlist + clif_equiplist = clif_inventorylist
- Increased max knockback value support to 25.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7109 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 6 insertions, 1 deletions

diff --git a/src/map/guild.c b/src/map/guild.c
index 8e4a16901..78ef6188d 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -1410,9 +1410,14 @@ int guild_opposition(struct map_session_data *sd,int char_id)
 			if(g->alliance[i].opposition==1){	// ‚·‚Å‚É“G‘Î

 				clif_guild_oppositionack(sd,2);

 				return 0;

-			}else	// “¯–¿”jŠü

+			} else { //Change alliance to opposition.

+				if(agit_flag)	{

+					clif_displaymessage(sd->fd,"You cannot break an alliance during Guild Wars!");

+					return 0;

+				}

 				intif_guild_alliance( sd->status.guild_id,tsd->status.guild_id,

 					sd->status.account_id,tsd->status.account_id,8 );

+			}

 		}

 	}