diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-09 18:11:32 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-09 18:11:32 +0000 |
| commit | 0638d728c718e648e622a524e5c3010d23b049d0 (patch) | |
| tree | 5f7786bcb230531682387b34e77598c7a4bbfbc7 /src/map/guild.c | |
| parent | d9cf596186c4432f100a70a5395587536a879223 (diff) | |
| download | hercules-0638d728c718e648e622a524e5c3010d23b049d0.tar.gz hercules-0638d728c718e648e622a524e5c3010d23b049d0.tar.bz2 hercules-0638d728c718e648e622a524e5c3010d23b049d0.tar.xz hercules-0638d728c718e648e622a524e5c3010d23b049d0.zip | |
- Fixed @npcmove not sending the correct packets to make the moving refresh client-side.
- Fixed mobs with aggressive + looter mode never looting.
- skill_wall_check now also checks for pits so that skill effects don't go through them.
- Now you can't leave/be-kicked from a guild inside guild castles.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5969 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index cc5065c51..473ca6258 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -778,7 +778,8 @@ int guild_leave(struct map_session_data *sd,int guild_id, return 0;
if( sd->status.account_id!=account_id ||
- sd->status.char_id!=char_id || sd->status.guild_id!=guild_id)
+ sd->status.char_id!=char_id || sd->status.guild_id!=guild_id ||
+ map[sd->bl.m].flag.gvg_castle) //Can't leave inside guild castles.
return 0;
for(i=0;i<g->max_member;i++){ // 所属しているか
@@ -804,7 +805,7 @@ int guild_explusion(struct map_session_data *sd,int guild_id, if(g==NULL)
return 0;
- if( sd->status.guild_id!=guild_id)
+ if(sd->status.guild_id!=guild_id || map[sd->bl.m].flag.gvg_castle) //Can't leave inside guild castles.
return 0;
if( (ps=guild_getposition(sd,g))<0 || !(g->position[ps].mode&0x0010) )
|