diff options
| author | Haru <haru@dotalux.com> | 2016-02-22 03:14:57 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-02-22 03:14:57 +0100 |
| commit | 91524e90f861275c6a1ee4d9e37b6b047b60df58 (patch) | |
| tree | 4c60a8705a5e62dea5c5c7591249d7b9858aec18 /src/map | |
| parent | 540b4b0a29cbfbab4df73e4be4f86d9024a48959 (diff) | |
| parent | 502b0e4646df008d47c9e3e957f652932a231e8c (diff) | |
| download | hercules-91524e90f861275c6a1ee4d9e37b6b047b60df58.tar.gz hercules-91524e90f861275c6a1ee4d9e37b6b047b60df58.tar.bz2 hercules-91524e90f861275c6a1ee4d9e37b6b047b60df58.tar.xz hercules-91524e90f861275c6a1ee4d9e37b6b047b60df58.zip | |
Merge pull request #1166 from 4144/fixemote
Fix crash on npc emote, if npc not found.
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/script.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/script.c b/src/map/script.c index 946b50955..289ea36e2 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -12105,7 +12105,7 @@ BUILDIN(emotion) { clif->emotion(&sd->bl,type); } else if( script_hasdata(st,4) ) { struct npc_data *nd = npc->name2id(script_getstr(st,4)); - if (nd == NULL) + if (nd != NULL) clif->emotion(&nd->bl,type); } else { clif->emotion(map->id2bl(st->oid),type); |