diff options
| author | Wushin <pasekei@gmail.com> | 2015-04-20 19:43:35 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-04-20 19:43:35 -0500 |
| commit | 07a9d90e699f613ec97273a741811123247b2029 (patch) | |
| tree | b4dff23049484d3b301b65372c32e932e0896ced /src/map/magic-stmt.cpp | |
| parent | 0b04c49460a2e0c894c818ae190465fc2607bca8 (diff) | |
| parent | 314e9229f7e33d3d15d1052af3e72dc5cfd502ad (diff) | |
| download | tmwa-07a9d90e699f613ec97273a741811123247b2029.tar.gz tmwa-07a9d90e699f613ec97273a741811123247b2029.tar.bz2 tmwa-07a9d90e699f613ec97273a741811123247b2029.tar.xz tmwa-07a9d90e699f613ec97273a741811123247b2029.zip | |
Merge pull request #63 from mekolat/magic-injure
fix bad condition
Diffstat (limited to 'src/map/magic-stmt.cpp')
| -rw-r--r-- | src/map/magic-stmt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/magic-stmt.cpp b/src/map/magic-stmt.cpp index fdeac3a..4d8330a 100644 --- a/src/map/magic-stmt.cpp +++ b/src/map/magic-stmt.cpp @@ -773,7 +773,7 @@ int op_injure(dumb_ptr<env_t> env, Slice<val_t> args) if (target->bl_type == BL::PC && !target->bl_m->flag.get(MapFlag::PVP) - && (caster->bl_type != BL::PC) + && (caster->bl_type == BL::PC) && ((caster->is_player()->state.pvpchannel > 1) && (target->is_player()->state.pvpchannel != caster->is_player()->state.pvpchannel))) return 0; /* Cannot damage other players outside of pvp */ |