diff options
| author | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-22 01:13:28 +0000 |
|---|---|---|
| committer | glighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-22 01:13:28 +0000 |
| commit | 078fe1c3ff072c85ca14a3465b0fc9d8a523711f (patch) | |
| tree | a5673dc034fe5beafa040810683a09d509006032 /src/map/clif.c | |
| parent | 88a2f6741ec3aee559495a219d499ecc3425a3f1 (diff) | |
| download | hercules-078fe1c3ff072c85ca14a3465b0fc9d8a523711f.tar.gz hercules-078fe1c3ff072c85ca14a3465b0fc9d8a523711f.tar.bz2 hercules-078fe1c3ff072c85ca14a3465b0fc9d8a523711f.tar.xz hercules-078fe1c3ff072c85ca14a3465b0fc9d8a523711f.zip | |
-Apply EvilPuncker path from tid:71756
-Fix and upd logzeny enumeration type bugreport:6897
-Upd @zeny to send a message when succed bugreport:6886
-Upd ChaosPanic to affect all bugreport:6893
-Upd bloodylust cooldown and disable endure effect bugreport:6547
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16940 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 3b5dc0f57..746a12a75 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -10179,8 +10179,8 @@ void clif_parse_UseItem(int fd, struct map_session_data *sd) if (sd->npc_id) { if (sd->npc_id != sd->npc_item_flag) return; - } else - if (pc_istrading(sd)) + } + else if (pc_istrading(sd)) return; //Whether the item is used or not is irrelevant, the char ain't idle. [Skotlex] |