diff options
author | Michieru <Michieru@users.noreply.github.com> | 2014-08-29 17:51:30 +0200 |
---|---|---|
committer | Michieru <Michieru@users.noreply.github.com> | 2014-08-29 17:51:30 +0200 |
commit | a06e53479131c25ce2343c431c688c57b3bfa2c0 (patch) | |
tree | 2c7e97912c83d029efc1e0461ccaa4ddd46bc50d /src/map/elemental.c | |
parent | b9511727e6a754ad5a11d21d30df98451c2dd69c (diff) | |
download | hercules-a06e53479131c25ce2343c431c688c57b3bfa2c0.tar.gz hercules-a06e53479131c25ce2343c431c688c57b3bfa2c0.tar.bz2 hercules-a06e53479131c25ce2343c431c688c57b3bfa2c0.tar.xz hercules-a06e53479131c25ce2343c431c688c57b3bfa2c0.zip |
Fix status def calculation (bug:8306)
Updated script command 'sc_start' to allow for more variables and options rAthena 17326 (bug:8217)
Fix Cart Tornado damage to official
elemental crashing/memory error (thanks to Ind)
Diffstat (limited to 'src/map/elemental.c')
-rw-r--r-- | src/map/elemental.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/elemental.c b/src/map/elemental.c index caba02692..b594c8899 100644 --- a/src/map/elemental.c +++ b/src/map/elemental.c @@ -218,6 +218,9 @@ int elemental_delete(struct elemental_data *ed, int reply) { sd->ed = NULL; sd->status.ele_id = 0; + if( !ed->bl.prev ) + return unit->free(&ed->bl, 0); + return unit->remove_map(&ed->bl, 0, ALC_MARK); } |