diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-02-20 20:54:18 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-02-20 20:54:18 +0000 |
| commit | 0d8bcc88e3a5d621b5e483b8af1eff7958f0fe79 (patch) | |
| tree | a5cbb583ba005588003ab0a9055d747c4b269082 /src/map/status.c | |
| parent | e5f3913f7ed4f2f5785c48bd9ed363b8bc259b6d (diff) | |
| download | hercules-0d8bcc88e3a5d621b5e483b8af1eff7958f0fe79.tar.gz hercules-0d8bcc88e3a5d621b5e483b8af1eff7958f0fe79.tar.bz2 hercules-0d8bcc88e3a5d621b5e483b8af1eff7958f0fe79.tar.xz hercules-0d8bcc88e3a5d621b5e483b8af1eff7958f0fe79.zip | |
- SC_NOCHAT won't be cancelled on death.
- Cleaned up the global message function. SN Explosion Spirits will no longer trigger in maps where said skill is unavailable.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5348 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c index ce0242511..3e36817c5 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4615,7 +4615,8 @@ int status_change_clear(struct block_list *bl,int type) //Type 0: PC killed -> EDP and Meltdown must not be dispelled. [Skotlex]
// Do not reset Xmas status when killed. [Valaris]
if(sc->data[i].timer == -1 ||
- (type == 0 && (i == SC_EDP || i == SC_MELTDOWN || i == SC_XMAS)))
+ (type == 0 &&
+ (i == SC_EDP || i == SC_MELTDOWN || i == SC_XMAS || i == SC_NOCHAT)))
continue;
status_change_end(bl, i, -1);
|