--- deliantra/server/server/attack.c	2006/02/22 18:03:19	1.1.1.2
+++ deliantra/server/server/attack.c	2006/03/24 10:51:18	1.5
@@ -1655,6 +1655,16 @@
     if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE))
         return 0;
 
+#ifdef PROHIBIT_PLAYERKILL
+    if (op->type == PLAYER) {
+        object *owner = get_owner (hitter);
+        if (!owner) owner = hitter;
+        if (owner->type == PLAYER && !op_on_battleground (op, 0, 0)) {
+              return 0;
+        }
+    }
+#endif
+
     op_tag = op->count;
     hitter_tag = hitter->count;
 
@@ -1768,8 +1778,11 @@
      */
     friendlyfire = friendly_fire(op, hitter);
     if (friendlyfire && maxdam){
-	maxdam = ((dam * settings.set_friendly_fire) / 100)+1;
-			
+	maxdam = ((dam * settings.set_friendly_fire) / 100);
+#ifndef COZY_SERVER
+        maxdam++;
+#endif
+	
 #ifdef ATTACK_DEBUG
 	LOG(llevDebug,"Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",
 	friendlyfire, settings.set_friendly_fire, dam, maxdam);