summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormekolat <mekolat@gmail.com>2015-04-19 14:21:09 -0400
committermekolat <mekolat@gmail.com>2015-04-19 14:21:09 -0400
commit314e9229f7e33d3d15d1052af3e72dc5cfd502ad (patch)
treeb4dff23049484d3b301b65372c32e932e0896ced /src
parent0b04c49460a2e0c894c818ae190465fc2607bca8 (diff)
downloadtmwa-314e9229f7e33d3d15d1052af3e72dc5cfd502ad.tar.gz
tmwa-314e9229f7e33d3d15d1052af3e72dc5cfd502ad.tar.bz2
tmwa-314e9229f7e33d3d15d1052af3e72dc5cfd502ad.tar.xz
tmwa-314e9229f7e33d3d15d1052af3e72dc5cfd502ad.zip
fix bad condition
Diffstat (limited to 'src')
-rw-r--r--src/map/magic-stmt.cpp2
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 */