diff options
| author | mekolat <mekolat@gmail.com> | 2015-04-03 14:20:01 -0400 |
|---|---|---|
| committer | wushin <pasekei@gmail.com> | 2015-04-04 00:27:43 -0500 |
| commit | ee8dff7687f120cbe55dccc56c1ae1f711bb68b5 (patch) | |
| tree | 04d071bbd1799e4b5f3b33d32bed99098b7d6acb /src/map/magic-stmt.cpp | |
| parent | 7f31bde507bee63e36ddaefd5d16ab314b98b601 (diff) | |
| download | tmwa-ee8dff7687f120cbe55dccc56c1ae1f711bb68b5.tar.gz tmwa-ee8dff7687f120cbe55dccc56c1ae1f711bb68b5.tar.bz2 tmwa-ee8dff7687f120cbe55dccc56c1ae1f711bb68b5.tar.xz tmwa-ee8dff7687f120cbe55dccc56c1ae1f711bb68b5.zip | |
make pvp use channels
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 544b290..fdeac3a 100644 --- a/src/map/magic-stmt.cpp +++ b/src/map/magic-stmt.cpp @@ -774,7 +774,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) - && (!target->is_player()->state.pvpon && !caster->is_player()->state.pvpon)) + && ((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) |