diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-25 10:13:52 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-25 10:13:52 +0000 |
| commit | 56c38376f23bf7b942247ef42b36ab7401397f0b (patch) | |
| tree | 3a1a67bce5c331481cdd2931da5160b86bed735d /src/map/guild.c | |
| parent | 3f59201b9eafb42da8364672d6fe0c6b155b2812 (diff) | |
| download | hercules-56c38376f23bf7b942247ef42b36ab7401397f0b.tar.gz hercules-56c38376f23bf7b942247ef42b36ab7401397f0b.tar.bz2 hercules-56c38376f23bf7b942247ef42b36ab7401397f0b.tar.xz hercules-56c38376f23bf7b942247ef42b36ab7401397f0b.zip | |
- You are allowed to expel guild mates that are not online now.
- Corrected damage of BloodDrain
- Moved the "already connected" checks to pc_authok, since a dual login doesn't needs to be checked until the new connection is accepted.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9916 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index a06b29f8d..a4c751e64 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -807,8 +807,8 @@ int guild_expulsion(struct map_session_data *sd,int guild_id, return 0; //Expulsion permission //Can't leave inside guild castles. - if ((tsd = map_id2sd(account_id)) == NULL || - tsd->status.char_id != char_id || + if ((tsd = map_id2sd(account_id)) && + tsd->status.char_id == char_id && map[tsd->bl.m].flag.gvg_castle) return 0; |