--- deliantra/server/server/attack.C	2007/05/12 21:56:34	1.63
+++ deliantra/server/server/attack.C	2007/05/17 14:14:55	1.64
@@ -773,25 +773,6 @@
     {
       int hitdam = base_dam;
 
-      if (settings.casting_time == TRUE)
-        {
-          if (hitter->type == PLAYER && hitter->casting_time > -1)
-            {
-              hitter->casting_time = -1;
-              new_draw_info (NDI_UNIQUE, 0, hitter, "You attacked and lost your spell!");
-            }
-
-          if (op->casting_time > -1 && hitdam > 0)
-            {
-              op->casting_time = -1;
-              if (op->type == PLAYER)
-                {
-                  new_draw_info (NDI_UNIQUE, 0, op, "You were hit and lost your spell!");
-                  new_draw_info_format (NDI_ALL | NDI_UNIQUE, 5, NULL, "%s was hit by %s and lost a spell.", &op_name, &hitter->name);
-                }
-            }
-        }
-
       if (!simple_attack)
         {
           /* If you hit something, the victim should *always* wake up.
@@ -1275,7 +1256,7 @@
                * Try to credit the owner.  We try to display player -> player drain
                * attacks, hence all the != PLAYER checks.
                */
-              if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WAS_WIZ))
+              if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WIZ))
                 {
                   object *owner = hitter->owner;
 
@@ -1564,7 +1545,7 @@
   new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);
 
   /* If you didn't kill yourself, and your not the wizard */
-  if (owner != op && !QUERY_FLAG (op, FLAG_WAS_WIZ))
+  if (owner != op && !QUERY_FLAG (op, FLAG_WIZ))
     {
       int exp;
 
@@ -1728,7 +1709,7 @@
   if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE))
     return 0;
 
-#ifdef PROHIBIT_PLAYERKILL
+  // only allow pk for hostile players
   if (op->type == PLAYER)
     {
       object *owner = hitter->owner;
@@ -1742,7 +1723,6 @@
           && op != owner)
         return 0;
     }
-#endif
 
   if (body_attack)
     {
@@ -1873,9 +1853,6 @@
   if (friendlyfire && maxdam)
     {
       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",