diff options
| author | wushin <pasekei@gmail.com> | 2015-04-01 01:27:04 -0500 |
|---|---|---|
| committer | wushin <pasekei@gmail.com> | 2015-04-04 00:27:07 -0500 |
| commit | 15e4ba4a14d912f70b0862bd1f0af9339dcbc6c0 (patch) | |
| tree | 428a9ecfeeafe8101057ab6fff6f4b311db8476b /src/map/magic-stmt.cpp | |
| parent | 6f4699ff0c6400a2adc5e4008b2e289737f4a303 (diff) | |
| download | tmwa-15e4ba4a14d912f70b0862bd1f0af9339dcbc6c0.tar.gz tmwa-15e4ba4a14d912f70b0862bd1f0af9339dcbc6c0.tar.bz2 tmwa-15e4ba4a14d912f70b0862bd1f0af9339dcbc6c0.tar.xz tmwa-15e4ba4a14d912f70b0862bd1f0af9339dcbc6c0.zip | |
Remove killer/killable
Death Clears default pvp
Add Player Togglable PvP Flag
Add Timer to PvP Flag (Anti-Spam)
Add getpvpflag builtin
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..544b290 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) + && (!target->is_player()->state.pvpon && !caster->is_player()->state.pvpon)) return 0; /* Cannot damage other players outside of pvp */ if (target != caster) |