diff --git a/source/combat.qc b/source/combat.qc
index 04ebcfe..59a05b2 100644
--- a/source/combat.qc
+++ b/source/combat.qc
@@ -1,11 +1,15 @@
 // combat.qc: entity-entity damage functions
 
 float(entity targ, entity attacker) SameTeam = {
-	return targ.team > 0 && targ.team == attacker.team;
+	return targ != attacker &&
+	       targ.team > 0 &&
+	       targ.team == attacker.team;
 };
 
 float(entity targ, entity attacker) BothPlayers = {
-	return targ.classname == "player" && attacker.classname == "player";
+	return targ != attacker &&
+	       targ.classname == "player" &&
+	       attacker.classname == "player";
 };
 
 /*