diff options
| author | Wushin <pasekei@gmail.com> | 2015-04-13 21:13:52 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-04-13 21:13:52 -0500 |
| commit | bf54afff27cd03ed535859009baa0b4c4fa663e9 (patch) | |
| tree | 92b3e0ab2e6e668da98cc023b27858e7c5fef419 /src/map/magic-stmt.cpp | |
| parent | c776b7a5d8075ede4a364bfdd0c6fb3cb6f6c5fa (diff) | |
| parent | 8e8876474eddefe474528c73851b3af2c6d9327f (diff) | |
| download | tmwa-bf54afff27cd03ed535859009baa0b4c4fa663e9.tar.gz tmwa-bf54afff27cd03ed535859009baa0b4c4fa663e9.tar.bz2 tmwa-bf54afff27cd03ed535859009baa0b4c4fa663e9.tar.xz tmwa-bf54afff27cd03ed535859009baa0b4c4fa663e9.zip | |
Merge pull request #41 from wushin/pvp-script-persistance
Make killer & killable script builtins
Diffstat (limited to 'src/map/magic-stmt.cpp')
| -rw-r--r-- | src/map/magic-stmt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/magic-stmt.cpp b/src/map/magic-stmt.cpp index c69dafa..fdeac3a 100644 --- a/src/map/magic-stmt.cpp +++ b/src/map/magic-stmt.cpp @@ -773,8 +773,8 @@ 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) - && !target->is_player()->special_state.killable - && (caster->bl_type != BL::PC || !caster->is_player()->special_state.killer)) + && (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 */ if (target != caster) |