--- deliantra/server/server/attack.c	2006/03/30 11:15:47	1.8
+++ deliantra/server/server/attack.c	2006/05/11 18:42:29	1.13
@@ -564,8 +564,7 @@
       return;
 
     /* Did a player hurt another player?  Inform both! */
-    /* only show half the player->player combat messages */
-    if(op->type==PLAYER && rndm(0, 1) &&
+    if(op->type==PLAYER &&
        (get_owner(hitter)==NULL?hitter->type:hitter->owner->type)==PLAYER) {
 	if(get_owner(hitter)!=NULL)
 	    sprintf(buf,"%s's %s %s you.",
@@ -584,8 +583,7 @@
 	new_draw_info(NDI_BLACK, 0,op,buf);
     } /* end of player hitting player */
 
-    /* scale down these messages too */
-    if(hitter->type==PLAYER && rndm(0, 2) == 0) {
+    if(hitter->type==PLAYER) {
 	sprintf(buf,"You %s.",buf1);
 	if (dam != 0) {
 	    if (dam < 10)
@@ -875,7 +873,7 @@
 object *hit_with_arrow (object *op, object *victim)
 {
     object *container, *hitter;
-    int hit_something;
+    int hit_something = 0;
     tag_t victim_tag, hitter_tag;
     sint16 victim_x, victim_y;
 
@@ -1375,8 +1373,6 @@
 	    op->owner->contr->ranges[range_golem]=NULL;
 	    op->owner->contr->golem_count=0;
 	}
-	else
-	    LOG (llevError, "BUG: hit_player(): Encountered golem without owner.\n");
 
 	remove_ob(op);
 	free_object(op);
@@ -1655,7 +1651,7 @@
         object *owner = get_owner (hitter);
         if (!owner) owner = hitter;
         if (owner->type == PLAYER
-            && !op_on_battleground (op, 0, 0)
+            && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful))
             && op != owner) {
               return 0;
         }