From ee8dff7687f120cbe55dccc56c1ae1f711bb68b5 Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@gmail.com>
Date: Fri, 3 Apr 2015 14:20:01 -0400
Subject: make pvp use channels

---
 src/map/magic-stmt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/map/magic-stmt.cpp')

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)
-- 
cgit v1.2.3-60-g2f50