Index: Creature.cpp
===================================================================
--- Creature.cpp	(revision 14)
+++ Creature.cpp	(working copy)
@@ -1053,6 +1053,14 @@
     SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS,cinfo->bounding_radius);
     SetFloatValue(UNIT_FIELD_COMBATREACH,cinfo->combat_reach );
 
+
+	FactionEntry* factionEntry = sFactionStore.LookupEntry(cinfo->faction);
+
+	if (factionEntry->team == ALLIANCE || HORDE && cinfo->civilian == 0)
+	{
+		SetPvP(true);
+	}
+
     if (cinfo->mount != 0)
         Mount(cinfo->mount);